latest changes as of friday afternoon
manually fixed merge issues
Merge branch 'master' of https://github.com/drchrislewis/industrial_calibration

Conflicts:
	industrial_extrinsic_cal/include/industrial_extrinsic_cal/basic_types.h
	industrial_extrinsic_cal/src/calibration_job.cpp
added temp files to gitignore