untested first commit
Merge branch 'master' of https://github.com/jsutton9/CS450-Project