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

Conflicts:
	spec/support/spec_helpers/rails_best_practices.rb