Gotta start somewhere

Derping around
Merge remote-tracking branch 'origin/master'

Conflicts:
	UberProject/Assets/Assets/SideThing.cs