cant get this to work
Merge branch 'master' of https://github.com/ccard/csci565Project2