minor update .gitignore and Gemfile.lock (https)
Homework 1.1

Saas CS169.2x homework 1 part 1 - new feature: merge articles

- implement model, view and controller
- rspec tests and cucumber features