Iteration of project 3 for CS 342.

We (Mark and I) will create the write-up and JAvaDocs
for this project this week.
Merge remote-tracking branch 'origin/master'