More clean
Merge branch 'master' of https://github.com/katetem/katniss

Conflicts:
	index.php