dos2unix change to remove crlf caused by gedit
Merge branch 'master' of https://github.com/nmathew87/spacejaunt

Conflicts:
	image_stitcher/src/image_stitcher_node.cpp