Merge branch 'master' of github.com:koding/global.hackathon

Conflicts:
	README.md
	README.template.md
This commit is contained in:
Lee Olayvar
2014-11-22 01:38:47 +00:00
14 changed files with 158 additions and 5 deletions
+2 -2
View File
@@ -23,5 +23,5 @@ the folder with your team name and inside this folder, create two files:
We will periodically run a script that will pull your info and populate
the lower section of this README.md file.
| #TeamName | Team Members | Team Page |
|---------------|--------------|-----------|
| #TeamName | Team Members | Team Page |
|-----------|--------------|-----------|