2players
heyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
Merge branch 'master' of github.com:connorbell/Reality-Approximator

Conflicts:
	reality/Assembly-CSharp-Editor.pidb
	reality/Assembly-CSharp.pidb
	reality/Assets/2DPlatformController/Scripts/ExtraFeatures/Projectile.cs
	reality/Assets/2DPlatformController/Scripts/ExtraFeatures/Shooter.cs
	reality/Assets/2DPlatformController/Scripts/Inputs/SimpleCharacterInput.cs
	reality/Assets/Scenes/Level1.unity
	reality/Assets/Scenes/reality_rules.unity
	reality/reality.userprefs