fuck you william
fixed sound error, sounds now play correctly
Merge remote-tracking branch 'origin/js'

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'