Made sounds play again
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop

Conflicts:
	app/js/controllers.js
Fixed sound effects playing on launch
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop