1
Merge branch 'master' of https://github.com/roymuste/CppPrimerSample

Conflicts:
	main.cpp
	smallint.cpp
	smallint.h