update to actually work everywhere
Merge branch 'master' of github.com:bengl/beatsio

Conflicts:
	public/docs.html
	public/index.html
	public/scripts/app.js