update
Merge branch 'master' of https://github.com/kubalaj/mobile_hackathon

Conflicts:
	server.py