init
Merge branch 'master' of github.com:manitourobotics/pre-2013