added in temp spritesheet
Merge remote-tracking branch 'origin/master'

Conflicts:
	DeionTheInsiculous/Library/assetDatabase3
	DeionTheInsiculous/Library/guidmapper