merge basic_model and updated gemfile.lock
merged rails_4.0.0