Adds CS2810 project02 changes.
Merge branch 'master' of github.com:n8armstrong/school

Conflicts:
	cs2810/chapter2.txt
Merge branch 'master' of github.com:n8armstrong/school