On-screen debug, updated .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scenes/level.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset