begin animatie + muziek ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	www/js/controllers.js
	www/templates/menu.html
	www/templates/menuGirl.html