new changes

Signed-off-by: jogam5 <jogam5@yahoo.com.mx>
Merge branch 'master' of github.com:jogam5/soxialit-landing

Conflicts:
	Gemfile

Signed-off-by: jogam5 <jogam5@yahoo.com.mx>