Changed some login stuff
hopefully will work.
Merge branch 'HEAD' of https://github.com/cramja/stocktracker.git

Conflicts:
	db.sqlite3
	users/views.py
push
Merge branch 'master' of https://github.com/cramja/stocktracker

Conflicts:
	users/views.py