Merge pull request #883 from olzhasktl/master

added team info
This commit is contained in:
Lee Olayvar
2014-12-03 12:08:01 -08:00
2 changed files with 20 additions and 0 deletions

View File

@@ -0,0 +1,3 @@
<h1>Welcome to our page!</h1>
<br/>
<h2>coding for fun and to win;)</h2>

View File

@@ -0,0 +1,17 @@
{
"teamName": "abracadabra",
"members": [
{
"name": "Toiteyev Olzhas",
"twitter": "toiteyev07",
"koding": "olzhast",
"location": "Almaty, KZ"
},
{
"name": "Shalabayev Yerassyl",
"twitter": "EraOneOfTheMany",
"koding": "nightbaker",
"location": "Almaty, KZ"
}
]
}