Signed-off-by: laiguangtao <laiguangtao@gmail.com>
Merge branch 'master' of https://github.com/montyqin/my_first_project.git

Conflicts:
	lancome/WebContent/file/catalog.json
	lancome/WebContent/index.jsp

Signed-off-by: laiguangtao <laiguangtao@gmail.com>