First commit
Merge branch 'master' of https://github.com/Jevarom/UCSD-2013_Robomagellan