SoccerSpace -Part 1

I know these are many files but yet they are there
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/routes.php

this is it