Users test
schema
Merge branch 'master' of https://github.com/MohamedBassem/CSEN704 into farghal_models

Conflicts:
	app/models/user.rb
	db/schema.rb