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

Conflicts:
	index.html