maybe this will work...
Merge branch 'master' of https://github.com/jbernie2/csc210final