merge conflicts
Merge branch 'master' of https://github.com/hockeybuggy/cis4110paper

Conflicts:
	report.pdf
rewording