subscribe and index
...
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	.gitignore
	WebContent/WEB-INF/web.xml
	WebContent/edit_users.jsp
	src/controller/EditUser.java
wrong info
web-inf