Fix changes
Merge branch 'master' of github.com:kubalaj/mobile_hackathon
Merge branch 'master' of github.com:kubalaj/mobile_hackathon
Add the green wolverines
Merge branch 'master' of github.com:kubalaj/mobile_hackathon

Conflicts:
	server.py