Public Site Implementation
Merge branch 'master' of github.com:vicocamacho/corporativomym

Conflicts:
	app/assets/stylesheets/theme.css.scss
	config/routes.rb