Add mergeconflict.txt
Merge branch 'master' of github.com:stuycs-softdev/submissions