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

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge pull request #1 from MohamedBassem/almgohar

announcement_report and bug fixes
Merge pull request #2 from MohamedBassem/almgohar

bug fixes & some models
Merge pull request #3 from MohamedBassem/almgohar

bug fixes
bug fixes