fixed stopping old music, added missing hairkeeper to objects.json
Merge branch 'master' of https://github.com/aatuh/kiigame

Conflicts:
	kiigame.js
	objects.json