Music for the people
Merge branch 'master' of https://github.com/Juzmach/hackathon-hk

Conflicts:
	HomokaasuTheGame/src/com/example/homokaasuthegame/MainActivity.java