yanomeacuerdo

yanomeacuerdo
Merge branch 'master' of https://github.com/johnnyleeothon/entre-mis-piernas

Conflicts:
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb