GitHub Being Dumb
Merge branch 'master' of https://github.com/trikeman/IntermediateGame

Conflicts:
	ProjectEcco/Library/assetDatabase3
	ProjectEcco/Library/guidmapper