Did some stuff
MTimerszerge branch 'master' of github.com:connorbell/Reality-Approximator

Conflicts:
	reality/Assembly-CSharp-Editor.pidb
	reality/Assembly-CSharp.pidb
	reality/Assets/Resources/Prefabs/Ceiling.prefab.meta
	reality/Assets/Resources/Prefabs/Floor.prefab.meta
	reality/Assets/Resources/Prefabs/MovingPlatform.prefab.meta
	reality/Assets/Resources/Prefabs/PassThroughPlatform.prefab.meta
	reality/Assets/Resources/Prefabs/Platform.prefab.meta
	reality/Assets/Scenes/Level1.unity
	reality/Assets/Scripts/Levels/Level.cs.meta
	reality/Assets/Scripts/Levels/Level1.cs.meta
	reality/Assets/Scripts/SphereReaction.cs
	reality/reality.userprefs