html
Merge branch 'master' of https://github.com/unscsprt/ebay_history

Conflicts:
	ebay_history/templates/home.html