no message
Merge branch 'master' of https://github.com/Hemmingsson/JukeBox

Conflicts:
	site/js/main.js