Try some more
Fixed! Merge branch 'master' of github.com:chungs1/HackerNet

Conflicts:
	app/views.py