Doing auth stuff
Merge branch 'master' of github:erhlee-bird/block-market

Conflicts:
	app/views.py
	requirements.txt