test
Update requirements.txt
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ucri/static/styles.css
	ucri/templates/login.html
Merged changes
Merge branch 'master' of github.com:quacha/UCRinterest into team