Initial commit
init gems
rolify
routes
Merge branch 'master_base'

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock
	README.md
	Rakefile
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	config.ru
	config/application.rb
	config/database.yml
	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/locales/en.yml
	config/routes.rb
	db/schema.rb
	db/seeds.rb
ajustes base
css