Fixing syntax errors
Merge branch 'farghal_models'

Conflicts:
	app/models/user.rb
schema
Merge branch 'master' of https://github.com/MohamedBassem/CSEN704 into farghal_models

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

announcement_report and bug fixes
add reminder model
add material model
Bug fixes
Merge pull request #2 from MohamedBassem/almgohar

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

bug fixes
Testing and bug fixes in Users and Courses
Merge branch 'master' of https://github.com/MohamedBassem/CSEN704 into farghal_models

Conflicts:
	app/models/user.rb