Bolton_Yuste check rebecca's for commit history
Merge branch 'master' of https://github.com/stuycs-softdev/submissions