Being dumb again
Merge branch 'master' of https://github.com/trikeman/IntermediateGame

Conflicts:
	ProjectEcco/Library/guidmapper
	ProjectEcco/ProjectEcco-csharp.sln
	ProjectEcco/ProjectEcco.sln