course management added
no message
Merge branch 'master' of https://github.com/gzy13245/CSCE606-Project_SOS

Conflicts:
	TAMUChineseSchool_final_final/config/routes.rb
	TAMUChineseSchool_final_final/db/development.sqlite3
	TAMUChineseSchool_final_final/log/development.log