chigggity check yo self befo yo wreck yoself
Merge branch 'master' of https://github.com/vattercw/SentinelsOfTheMultiverse

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