Tested pushing
Merge branch 'master' of https://github.com/cognitiverobots/SS2014