調整代碼位置
just change code position, no major change
popup
delete companyList.jsp for conflict
Merge branch 'master' of https://github.com/hjmu/incu.git

Conflicts:
	inc2_tw2/WebContent/companyList.jsp
change back companylist.jsp