Committing gemfile.lock for merge
Merge branch 'master' of github.com:tsnow/video