Added Berksfile.lock, and removed it from gitignore.
Merge branch 'master' of github.com:amedia/aid-devbox