level 3 update
Merge branch 'master' of https://github.com/LeTaulier616/crazy_magnets

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj