On branch features---1
 Your branch is up-to-date with 'origin/features---1'.
	modified:   app/models/user.rb