Housekeeping
Merge remote-tracking branch 'origin/master'

Conflicts:
	RobotSpaceMiner/Assets/Scenes/MainLevel.unity
	RobotSpaceMiner/Assets/Standard Assets/Scripts/BasicMovement.cs
	RobotSpaceMiner/Assets/Standard Assets/Scripts/FireballBehavior.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	RobotSpaceMiner/Assets/Scenes/MainLevel.unity
	RobotSpaceMiner/Assets/Standard Assets/Scripts/BasicMovement.cs
	RobotSpaceMiner/Assets/Standard Assets/Scripts/FireballBehavior.cs
Committing