a
a
Merge branch 'master' of https://github.com/vanwang/puma2

Conflicts:
	src/main/webapp/login.html
	src/main/webapp/login_.html