merge
Merge branch 'develop' of https://github.com/emperorjk/Triumph into develop

Conflicts:
	Assets/Scripts/Main/GameLoop.cs
	Assets/Scripts/TestGetTilesInRange.cs
	Assets/Scripts/TestGetTilesInRange.cs.meta
	Triumph.v12.suo