9.2.2
9.2 end

http://railstutorial.ru/chapters/updating-showing-and-deleting-users#top
Mac IDEA
9.4 done
9.5 end
Merge branch 'updating-users'

Conflicts:
	.idea/.rakeTasks
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/rails_projects.iml
	.idea/workspace.xml