cleaning up a little
started new test case
Merge branch 'master' of https://github.com/clarkkev/451-project-2
a little cleanup
updates tests