not pretty but works
Merge branch 'master' of github.com:stuycs-softdev/submissions
Merge branch 'master' of github.com:stuycs-softdev/submissions