tdouble
Merge branch 'master' of https://github.com/yourownmood/Project-Name

Conflicts:
	help/index.php