Modifications for login functionality.
Merge branch 'master' of https://github.com/garyForeman/CS411Project

Conflicts:
	FoxDB/app/views.py