Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	DuelMajorRepo.userprefs
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	DuelMajorRepo.userprefs
no message
Added end of match screeeeeen
spawn points are now gameobjects
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo

Conflicts:
	DuelMajorRepo.userprefs