formatting
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release

Conflicts:
	spec/support/spec_helpers/rails_best_practices.rb
fix last merge
add code climate to README
pry has rb-readline bug
merge