change

change
Merge branch 'master' of https://github.com/craigcosmo/kingsmen

Conflicts:
	app/config/config.php
	app/views/doctype.php