fix
fix
course
Merge branch 'farghal_models'

Conflicts:
	app/models/user.rb