I hate this!
Merge branch 'master' of https://github.com/rhelmstetter/445Proj5