param changes... still doesn't work
Merge branch 'master' of github.com:SquadCollaborativeRobotics/collectorbot_gazebo

Conflicts:
	launch/OneBotNamespace/move_base_onebot.launch
new move base file
Merge branch 'master' of github.com:SquadCollaborativeRobotics/collectorbot_gazebo
Merge branch 'master' of github.com:SquadCollaborativeRobotics/collectorbot_gazebo into shawn_stuff
Merge branch 'master' of github.com:SquadCollaborativeRobotics/collectorbot_gazebo into shawn_stuff
Merge branch 'master' of github.com:SquadCollaborativeRobotics/collectorbot_gazebo into shawn_stuff
working cubicle demo
added twobot amcl
Merge branch 'shawn_stuff'