Update homepage.html
Update models.py
Update models.py
Merge branch 'master' of https://github.com/knagra/farnsworth

Conflicts:
	base/templates/homepage.html