DavidG7/cs4427 — pull request #7 by wesleyhoffler (2014-11-14 15:26:48+00:00)
Title: Monday final

we want to merge