UI Play
Merge branch 'master' of https://github.com/nathanlippi/bitsplit_frontend

Conflicts:
	public/main.js
	public/views/index.html
Merge branch 'master' of https://github.com/nathanlippi/bitsplit_frontend