Extended User
Merge branch 'master' of github.com:CS192-Felizmenio/RRS

Conflicts:
	login/views.pyc
	rrs.db
Extended User model