Debugging version
Bump version
Merge branch 'master' of github.com:flatiron-school/jasmine-flatiron

Conflicts:
	lib/jasmine/flatiron/version.rb
Add Oj and bump