Removed files that weren't supposed to be there
Fix merge conflicts in my login project
Merge branch 'master' of github.com:stuycs-softdev/submissions
Merge branch 'master' of github.com:stuycs-softdev/submissions
Merge branch 'master' of github.com:stuycs-softdev/submissions
Merge branch 'master' of github.com:stuycs-softdev/submissions
Merge branch 'master' of github.com:stuycs-softdev/submissions
I have no idea why this doesn't work.
Merge branch 'master' of github.com:stuycs-softdev/submissions