get gitignore
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
"unknown issue about pull"
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
Merge branch 'master' of https://github.com/axl411/E-Commerce-Demo-Site.git
conflict
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	src/controller/Author.java
search feature in processing
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git

Conflicts:
	src/model/Edition.java
	src/model/Review.java