plz
Merge branch 'master' of https://github.com/stuycs-softdev/submissions

Conflicts:
	6/Argodale_Jane/goodbadjokes.txt