Nearly finished
Failure to give proper shrubbery
Merge branch 'master' of github.com:stuycs-softdev/submissions

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