Merge branch 'master' of https://github.com/eugeneration/Amigo-Server

Conflicts:
	hello.py
Merge branch 'master' of heroku.com:amigo-server

Conflicts:
	hello.py