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

Conflicts:
	css/stylehome.css