Gemfile.lock
Don't remember what I did -- but tests pass
Merge branch 'evaluation-test-cases' of github.com:alneberg/pfitmap into evaluation-test-cases
Merge branch 'evaluation-test-cases' of github.com:erikrikarddaniel/pfitmap into stable

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

Conflicts:
	Gemfile.lock