discussionDoard creation
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into C2_magdi_add_info
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into C2_magdi_add_info
modifications
modifications
Update README.md
Fixing Stuff => Staff
Fixing merge

Conflicts:
	tutor/app/models/staff.rb
	tutor/app/models/test_case.rb
	tutor/db/migrate/20140323113417_create_test_cases.rb
	tutor/db/schema.rb
fixing error
fixing many Lecturer_Topics
fixing TA has many courses
Merge pull request #147 from alaashafaee/dev_models

Dev models
adding TrackProgression model
Merge pull request #148 from alaashafaee/dev_models

Dev models
Show discussionBoard
Adding Course Controller
Addin Topics Controller
Fixing Conflicts
Fixing Conflicts with C1_Akram
Fixing conflcts with magdi