.gitignore class
0422 session
0424 md5, json
Merge branch 'master' of https://github.com/ylc1218/QRphone
0424 web.xml Test
Merge branch 'lowlow'
0424 web.xml Test
0424 ignore class
Merge branch 'ylc'
Merge branch 'master' of https://github.com/ylc1218/QRphone

Conflicts:
	WebContent/WEB-INF/web.xml
.gitignore done
Merge branch 'master' into ylc
0425 newQrId
new a pair of qrphone