tried a bunch of stuff
Merge branch 'master' of https://github.com/DanielNi/Soundboard

Conflicts:
	soundboard.html