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

Conflicts:
	README.md