Include fixes
Obstacle drawing; working on player controller