example script testing
Merge remote-tracking branch 'origin/Adam' into Jake
script testing
Merge remote-tracking branch 'origin/Adam' into Hans
Merge remote-tracking branch 'origin/Jake' into Hans
merge
Merge remote-tracking branch 'origin/Hans' into Jody

Conflicts:
	DDD/Library/InspectorExpandedItems.asset
a library file got in removed and may cause some issues with merge but it should not be in the project. ExpandInspectector.asset
new ignore
Merge remote-tracking branch 'origin/Jody' into Adam

Conflicts:
	DDD/Library/InspectorExpandedItems.asset