this should work...
Merge branch 'master' of github.com:Jaemu/cse508