Updated login
merged

Merge branch 'HEAD' of https://github.com/cramja/stocktracker.git

Conflicts:
	db.sqlite3
	stocks/__pycache__/__init__.cpython-33.pyc
	stocks/__pycache__/settings.cpython-33.pyc
	stocks/__pycache__/urls.cpython-33.pyc
	stocks/__pycache__/wsgi.cpython-33.pyc
	stockview/__pycache__/__init__.cpython-33.pyc
	stockview/__pycache__/admin.cpython-33.pyc
	stockview/__pycache__/models.cpython-33.pyc
	stockview/__pycache__/views.cpython-33.pyc
	users/__pycache__/__init__.cpython-33.pyc
	users/__pycache__/admin.cpython-33.pyc
	users/__pycache__/urls.cpython-33.pyc