Merge branch 'master' of github.com:jdelacroix/simiam into coursera-week-4
Added AvoidObstacles controller and adjusted it for the QuickBot.
Merged previous branches before pushing.
Merging changes from coursera-week-1 branch.
Merged changes from parent branch.
Merge remote-tracking branch 'origin/coursera-week-4' into coursera-sp14