Merge pull request #1 from decareano/scrum-spike

Scrum spike
reverting to old gemfile.lock
wrote failing testing behavior of Scrum#videos_by
Merge pull request #3 from johnnymo87/scrum-spike

wrote failing testing behavior of Scrum#videos_by