Fixed bug in last merge
Merge branch 'master' of github.com:strixcuriosus/Synesthesia

Conflicts:
	app.js