Initial commit for Colin's branch
Merge branch 'master' of https://github.com/cschieb/CS410-FinalProject into matt