Remove silly copy-pasta leftover
Add settings
Merge branch 'master' of github.com:nkp/hackkings

Conflicts:
	views/__init__.py