test
test
Merge branch 'master' of https://github.com/namonlyone/Win3GitMastering

Conflicts:
	Demo/src/main/webapp/index.jsp
Nam's index