text mistake
navi bar bug
Merge branch 'master' of github.com:bingluo/gw_en_site into bingluo-master

Conflicts:
	Courses.html
	assets/css/main.css
Slide IE6 Supported.