git Test 2
test2
test2
test222
test2
haha
Merge branch 'master' of https://github.com/shinsang/MTechNet.git

Conflicts:
	WebContent/pages/search/searchList2.jsp