Clean up name conflict
Merge branch 'master' of github.com:stuycs-softdev/submissions
Closed shelves