This is my commit message
Merge branch 'master' of https://github.com/addahlbe/MinionTriForce.

Conflicts:
	Main/Main.dbmdl
	MinionTriForce.sln.docstates.suo
	MinionTriForce.suo
Merge branch 'master' of https://github.com/addahlbe/MinionTriForce