htaccess
Merge branch 'master' of https://github.com/aoricm/htaccess

Conflicts:
	README.md