adding app/controllers/api/, app/views/api/, spec/controllers/
adding Gemfile.lock
merging local branch with remote