Including Gemfile.lock in repository.
Merge commit 'c4bcd386b654defcceb90614771a411fa5ac747b' into flags