test commit
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	WebContent/WEB-INF/web.xml
	WebContent/login_register.jsp
	WebContent/reviewable_articles.jsp
	build/classes/.DS_Store
	src/controller/Author.java
	src/controller/AvailableArticles.java
	src/controller/Reviewer.java
	src/model/Article.java
	src/model/DBFetcher.java
test
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	WebContent/WEB-INF/web.xml
	WebContent/login_register.jsp
	src/controller/Author.java
	src/model/Article.java
	src/model/DBFetcher.java
check
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	WebContent/WEB-INF/web.xml