removed accidently code
Merge branch 'master' of github.com:WyncodeCo/prework

Conflicts:
	app/models/user.rb