gitignore htaccess
Merge branch 'master' of https://github.com/chronicinsomnia/CakePHP

Conflicts:
	.gitignore