local first
Merge branch 'master' of https://github.com/jianhuayang/codIDTest

Conflicts:
	lab09_01_routing_intro0.html
	lab09_01_routing_intro1.html
	lab09_01_routing_intro2.html
	lab09_01_routing_intro2.js
	lab09_01_routing_intro2_comp_details.html
	lab09_01_routing_intro2_comp_login.html
	lab09_01_routing_intro2_comp_overview.html