ruby 2.1.2
ruby 2.1.2
don't pin rails
add bootstrap-generators
use master for simple_form; add compass-rails
don't source control database.yml
fix application template after adding bootstrap generators
add raicoto
add sidekiq
bundle update. rails -> 4.1.4
doesn't find bootstrap variables
remove bootstrap-generators and update application.css.scss per bootstrap-sass 3.2
Merge branch 'merge_after_update'

Conflicts:
	Gemfile
	app/assets/stylesheets/application.css.scss