Changes after Thursday of Competition..?
Merge branch 'master' of https://github.com/cwrucutter/cwrucutter_core

Conflicts:
	cutter_amcl/src/cutter_amcl.cpp
	cutter_localization/launch/odometry_encoders.launch
	cutter_localization/start_localization.launch