im hoping this does something by adding it first
Merge branch 'master' of github.com:stuycs-softdev/submissions

Conflicts:
	7/islam_yaseen/swagtastic.py