latest code
Merge branch 'master' of https://github.com/bassdread/hopper

Conflicts:
	hopper/app.py