rails_apps_composer: initial commit
rails_apps_composer: Gemfile
rails_apps_composer: create database
rails_apps_composer: generators
rails_apps_composer: testing framework
rails_apps_composer: set email accounts
rails_apps_composer: models
rails_apps_composer: controllers
rails_apps_composer: front-end framework
rails_apps_composer: add README files
rails_apps_composer: set up database
rails_apps_composer: extras
init
preparando layout
preparando layout
Merge branch 'master' of github.com:nahue/TODO

Conflicts:
	Gemfile
	Gemfile.lock
	README
	README.md
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/controllers/application_controller.rb
	app/controllers/home_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/models/ability.rb
	app/models/role.rb
	app/models/user.rb
	app/views/layouts/_navigation_links.html.erb
	config/application.example.yml
	config/application.rb
	config/initializers/secret_token.rb
	config/initializers/simple_form_bootstrap.rb
	config/locales/simple_form.en.yml
	config/routes.rb
	db/schema.rb
	db/seeds.rb
	spec/controllers/users_controller_spec.rb
	spec/factories/users.rb
	spec/models/user_spec.rb
	spec/spec_helper.rb