Lynda Parser
	modified:   cs/jhu/edu/shizhang/main.py
Merge branch 'master' of https://github.com/szhang37/iCollegeParser

Conflicts:
	cs/jhu/edu/shizhang/main.py

	modified:   cs/jhu/edu/shizhang/EdxCourseParser.py
	modified:   cs/jhu/edu/shizhang/EdxCourseParser.pyc
	modified:   cs/jhu/edu/shizhang/EdxParser.py
	modified:   cs/jhu/edu/shizhang/EdxParser.pyc
	modified:   cs/jhu/edu/shizhang/main.py
	modified:   cs/jhu/edu/shizhang/myHtmlPaser.py
	modified:   cs/jhu/edu/shizhang/myHtmlPaser.pyc