Scripting work
Merge remote-tracking branch 'origin/master'

Conflicts:
	GrandpaBlows/Assets/Model/Materials/cakeInUV.mat
	GrandpaBlows/Assets/Particles/Sources/Materials/Fire Smoke.mat
	GrandpaBlows/Assets/Particles/Sources/Materials/Smoke1.mat
	GrandpaBlows/Assets/Scenes/mjtest.unity
	GrandpaBlows/GrandpaBlows-csharp.sln
	GrandpaBlows/GrandpaBlows.sln
	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
Merge branch 'master' of https://github.com/Population1000/GrandpaBlows

Conflicts:
	GrandpaBlows/Assets/Model/Materials/cakeInUV.mat
	GrandpaBlows/Assets/Particles/Sources/Materials/Fire Smoke.mat
	GrandpaBlows/Assets/Particles/Sources/Materials/Smoke1.mat
	GrandpaBlows/Assets/Scenes/mjtest.unity
	GrandpaBlows/GrandpaBlows-csharp.sln
	GrandpaBlows/GrandpaBlows.sln
	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 branch 'master' of https://github.com/Population1000/GrandpaBlows"

This reverts commit 75a79a165215c7f5d8734a252f1e350118a5adfd.