Cambios iniciales para el soporte de autenticacion
Merge branch 'Autenticacion'

Conflicts:
	Gemfile
	Gemfile.lock
	Gemfile~
	app/assets/javascripts/application.js~
	app/controllers/home_controller.rb
	app/views/layouts/application.html.erb~
	db/schema.rb
Merge branch 'master' of https://github.com/wrcdriver/BoleteriApp

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	db/schema.rb~