office commit
Merge branch 'master' of https://github.com/kmad87/acpp_progs

Conflicts:
	.gitignore
	ch2/ch2_1.cpp

merging office and home work