Updated user log-in stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.py
	main.py
Fixed a few log in issues.