Connected Login method to DB users
fixing merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	__pycache__/dummy_data.cpython-33.pyc
	__pycache__/layouts.cpython-33.pyc
	__pycache__/views.cpython-33.pyc
	dummy_data.py