completed Ch2 exercised 2 & 4
Merge branch 'develop' of
git@github.com:Rescue9/CIT-142-Cpp-Programming-1.git into develop

Conflicts:
	CIT-142_Ch2_Ex4/Floor.cpp