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.