En la laptop nueva
Merge branch 'master' of https://github.com/donedgardo/sample_app

Conflicts:
	spec/requests/user_pages_spec.rb