Set up player and obstacle relationship
Added Playground class as container for obstacles.
Removed obstacles from controller
Merge origin/master