fix ally
Bunch of random stuff
Merge branch 'master' of https://github.com/zhanhuang/SuperMassiveBlackhole

Conflicts:
	Assets/Scenes/zhan_test.unity
combat music
sound commit
Stuff
Merge branch 'master' of https://github.com/zhanhuang/SuperMassiveBlackhole

Conflicts:
	Assets/Scenes/zhan_test.unity
shop fully functional
Merge branch 'master' of github.com:zhanhuang/SuperMassiveBlackhole
shope text fix