Part 2 complete
Merge branch 'master' of
https://github.com/landonrobinson/4180AssignmentOne.git

Conflicts:
	src/PartTwo.java