conflict
Merge branch 'master' of https://github.com/mayano/training_maya

Conflicts:
	app/controllers/category_controller.rb
article modified