this is the file for the merge
Merge branch 'master' of github.com:stuycs-softdev/submissions

Conflicts:
	7/conybeare_sebastian/merge-test