modified:   survey.cpp
	modified:   ../../config/lbl.cfg
	deleted:    ../cpp/.information.cpp.swp
	deleted:    .survey.cpp.swp
Merge branch 'master' of https://github.com/jmwalls/vittorio_summer
	deleted:    cpp/.information.cpp.swp
	deleted:    surveyor/.survey.cpp.swp
	modified:   surveyor/survey.cpp
	modified:   ../config/lbl.cfg