hahahaha

put a capsule
try2
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitHub Dry Run/GitHub Dry Run-csharp.sln
	GitHub Dry Run/GitHub Dry Run.sln
	GitHub Dry Run/Library/CurrentLayout.dwlt
	GitHub Dry Run/Library/assetDatabase3