modified src/main; added controls/WallFollow
Merge branch 'master' of https://github.com/sqshemet/maslab-2014