comito
Merge branch 'master' of https://github.com/Guillermoo/promos

Conflicts:
	.htaccess