Added controller and floor

Just added the first person controller and the floor so you can walk
around
Merge branch 'Jurien'
Merge branch 'master' into Alan