avoiding conflict with namespaces
Merge branch 'master' of https://github.com/fhacktory/StochasticMind

Conflicts:
	Assets/Scripts/MainBattle/HPBars.meta