htaccesDelOrto
Merge branch 'master' of https://github.com/trumantruman/cakephp

Conflicts:
	.htaccess
Merge branch 'master' of https://github.com/trumantruman/cakephp
htaccesModificado