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

Conflicts:
	db.sqlite3
	users/views.py