Fixed Merger
Merge branch 'master' of https://github.com/gastew15/Evolo

Conflicts:
	Evolo/Evolo/GameClass/FieldManager.cs