rails new
boilerplate
boilerplate
Merge branch 'rails_conversion'

Conflicts:
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb
Merge branch 'master' of github.com:AngryEgret/ladder