before pull
Merge branch 'master' of https://github.com/Trayus/ggj2014

Conflicts:
	main.js
Music