reindent
;
Merge branch 'master' of github.com:bcaccinolo/hitweb

Conflicts:
	index.php