tip
Merge branch 'master' of https://github.com/omega-techno/apache_htaccess

Conflicts:
	index.html