lucy modify
Merge branch 'master' of github.com:tyrellsys/group1 into lucypark_0513

Conflicts:
	index.html
Merge branch 'master' into lucypark_0513

Conflicts:
	index.html