Nada

:c
Merge branch 'jonathan'

Conflicts:
	Rakefile
	app/views/layouts/application.html.erb
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
RoR correcto

Ya c:
Merge branch 'master' into jonathan

Conflicts:
	config/initializers/secret_token.rb