ajustes
Merge branch 'master' of github.com:ismaelrd/el-salvador-adelante

Conflicts:
	app/views/categories/index.html.haml