Sorry if this breaks anything...
Merge branch 'master' of github.com:nkp/hackkings

Conflicts:
	static/css/styles.css