modified models
Merge branch 'master' of github.com:benloustau/rails_blog

Conflicts:
	app/models/user.rb
changed models
Merge branch 'master' of github.com:benloustau/rails_blog
modified show