added cone
Merge remote-tracking branch 'origin/master'

Conflicts:
	GrandpaBlows/Library/CurrentLayout.dwlt
	GrandpaBlows/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	GrandpaBlows/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	GrandpaBlows/Library/assetDatabase3
	GrandpaBlows/Library/expandedItems
	GrandpaBlows/Library/guidmapper
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit a90c42faa5f930fda00c29e6722e5e79aa743b60.