more launch files to do fall stuff
Merge branch 'master' of github.com:SquadCollaborativeRobotics/global_planner into sam
falldemo_test
working p3dx namespaced
 two bots
* robot ID fix.
Merge branch 'sam' into april_tags

Conflicts:
	launch/global_planner.launch
	src/RobotController.cpp