Git Ignore
Tutorial Skeleton
Merge branch 'master' into Ebby

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/3f/3fd4bfe840fe54e8eba949795047468b
	Library/metadata/43/436ec216e094d4081877e9fa28525ee8
	Library/metadata/ac/ac367411a033d4cb5b402fa6144f8250
	Library/metadata/b1/b1ad97f5e64244b639971dc939082f4e
	Library/metadata/bf/bfa8b25d3b7f94dcaab986e9d8a62d4e