no message
Merge branch 'master' of https://github.com/PhpNinja/duty

Conflicts:
	css/stylehome.css