update
Merge branch 'master' of https://github.com/Cosmo/up-and-down

Conflicts:
	web/public/index.html
Merge branch 'master' of https://github.com/Cosmo/up-and-down