Adding default mysql server password
migrations
Merge branch 'master' of github.com:MohamedBassem/CSEN704
Adding test route
Adding announcements
Adding tag model
user model and course beta
Adding Course Invitation
Merge branch 'almgohar'

Conflicts:
	app/models/course.rb
	app/models/user.rb
Merge branch 'master' into bassem

Conflicts:
	app/models/question.rb
	app/models/user.rb
Adding Rating super model
course model bardo
Database Migration
Fixing announcmenet type column
Creating Rating STI
schema
Merge branch 'master' of https://github.com/MohamedBassem/CSEN704 into farghal_models

Conflicts:
	app/models/course.rb
	app/models/user.rb
	db/schema.rb
Removing trailing spaces and converting tabs to 2 spaces
fix
fix