Merging.
Merge branch 'Milestone_1' of https://github.com/jslinker/CS340 into Milestone_1