first edition
Merge github.com:jx0260/lifeRecord

Conflicts:
	src/main/webapp/index.jsp