course page
merge
coursepage course description
Merge branch 'master' of ssh://edfward.com/srv/git/xuezhangshuo

Conflicts:
	xuezhangshuo/templates/CoursePage.html
	xuezhangshuo/templates/base.html
Merge branch 'master' of edfward.com:/srv/git/xuezhangshuo
BUG: cannot display course description anymore!!!; modified README.md