Added rubocop to the gemfile because swags didn't
Add the rails_best_practices gem
Merge branch 'master' into refactor

Conflicts:
	Gemfile
	Gemfile.lock