got some music for the game
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameApplication.cpp