fix music
fix conflicts
change map, resize pac
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
to pull latest copy
Merge pull request #85 from dabeeya/master

fix star location, fixed map and etc