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

Conflicts:
	login/6/lui_marlena_luo_jason/app.py
Merge branch 'master' of github.com:stuycs-softdev/submissions