man, I ain't yo mum, I has legs
Merge branch 'master' of https://github.com/vattercw/SentinelsOfTheMultiverse

Conflicts:
	SentinelsOfTheMultiverse/SentinelsOfTheMultiverse/Data/Heroes/Haka.cs