rails_apps_composer: initial commit
rails_apps_composer: Gemfile
rails_apps_composer: create database
rails_apps_composer: testing framework
rails_apps_composer: add README files
rails_apps_composer: navigation links
rails_apps_composer: extras
Adding ruby-version
Working on deploy
Merge branch 'master' of github.com:dperezrada/lala

Conflicts:
	Gemfile
	Gemfile.lock
	README
	README.md
	app/assets/javascripts/application.js
	config/application.rb
	config/environments/development.rb
	config/environments/production.rb
	config/initializers/secret_token.rb
	config/routes.rb