koding/global.hackathon — pull request #877 by turbopape (2014-12-03 09:20:46+00:00)
Title: Updated TNTeam json + about

- Updated Koding account. We do not need the other account any more.
- Removed the merge conflict caused by changing README.md by hand.