bunch of changes
Merge branch 'master' of https://github.com/funnyjk/beepit

Conflicts:
	public/index.html