More MEH
Merge remote-tracking branch 'origin/master'

Conflicts:
	ArchonClone/Assets/Scripts/BattleStats.cs
Merge branch 'master' of https://github.com/polseane9067/GDD450