Merge branch 'master' of https://github.com/TeamZilla/Destroyer

Conflicts:
	Destroyer/source/GameScene.cpp
	vs2013/Destroyer/source/Health.cpp