Added rspec test for controller
Concluded merge
Took Gemfile.lock out of .gitignore
new Gemfile.lock after bundle install