new file:   cpp/.information.cpp.swp
	modified:   surveyor/.survey.cpp.swp
	modified:   surveyor/CMakeLists.txt
	modified:   surveyor/survey.cpp
	deleted:    viewer/.topside_viewer.cpp.swp
Merge branch 'master' of https://github.com/jmwalls/vittorio_summer