chap3_2 added from lab
Merge remote-tracking branch 'origin/master'

Conflicts:
	chap3/Stack.h