delete htaccess file
Merge branch 'master' of https://github.com/mino89/MinoFramework

Conflicts:
	.htaccess