Actually added my stuff to the existing code from Spencer/Whatever this time
Some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Arenas/TestStage1/Test Stage 1.unity
	DuelMajorRepo.userprefs
Spanker Butts