ignore gemfile.lock
Merge branch 'master' of github.com:ozelen/dj-engine