Baseline
Basic authentication.
Merge branch 'master' of github.com:jriverac/Vitruplastik

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb
	config/database.yml
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	script/rails