sin cambios
Merge branch 'master' of https://github.com/israelmgo/so-simple-theme

Conflicts:
	assets/css/main.css
restore main.css