Updated prefabs
Merge remote-tracking branch 'trevor/master'

Conflicts:
	Assets/Scripts/GameLogicScript.cs
	Assets/Scripts/StoneScript.cs
Final fixed everything