Calculator functionality updated.  Layout not finished
Calculator functionality and layout updated.
Merge branch 'master' of github.com:EthanGarrison/PCannon into calculator
Merging master into calculator
Conflicts:
	Assets/Scene/Main.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	PCannon.userprefs
Merge branch 'master' into calculator
Remove libraryfolder
update .gitignore Library