spring clean part 2
Merge branch 'master' of https://github.com/cramja/stocktracker

Conflicts:
	db.sqlite3
	stocks/views.py