Gemfile.lock
Merge branch 'stable'
Merge branch 'master' of github.com:erikrikarddaniel/pfitmap