h
Merge branch 'master' of https://github.com/conradhappeliv/musicHackathon

Conflicts:
	public/js/main.js