Merge branch 'master' of https://github.com/scott-nevin/47981

Conflicts:
	Project2/Nevin_project_2/Nevin_project_2.pro
	Project2/Nevin_project_2/Nevin_project_2.pro.user
	Project2/Nevin_project_2/main.cpp

Project2/build-Nevin_project_2-Desktop_Qt_5_1_1_clang_64bit_qt_511-Debug
/Nevin_project_2
	Project2/main.cpp
	Project2/nevin_project_2/main.cpp