Working on bug fix
Revert "Working on bug fix"

This reverts commit f31b42a4b7d4b7860e88b80260155e8a9dc0ffd6.
Merge branch 'Milestone_1' of https://github.com/jslinker/CS340 into Milestone_1