Issues #412 #413 removing extra tab
Issues #415 adding assignment table
Issues #415 #426 + seperating table problem into 3 tables
Issues #432 #431 #419 #418
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140323110716_create_courses.rb
	tutor/db/migrate/20140323112245_create_problems.rb
	tutor/db/migrate/20140323112347_create_solutions.rb
	tutor/db/migrate/20140505095450_create_contests.rb
Issue #412 #413 #415 #418 #419 #426 #431 #432 fixing relations
Issues #436 #437 #446 #467
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 into dev_database

Conflicts:
	tutor/db/seeds.rb
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140323110716_create_courses.rb
	tutor/db/migrate/20140323112347_create_solutions.rb
	tutor/db/migrate/20140323113117_create_method_parameters.rb
	tutor/db/migrate/20140505095450_create_contests.rb
	tutor/db/migrate/20140507114032_create_grades.rb
	tutor/db/migrate/20140508175855_create_assignment_problems.rb
adding description to resources table
Merge branch 'database_migrations' into dev_database

Conflicts:
	tutor/db/migrate/20140509205739_create_resources.rb
Merge pull request #453 from alaashafaee/dev_database

Dev database