first
second
hej hej
from homa
Merge pull request #1 from Homa1127/master

from homa
From Pooya
from narrges
Merge pull request #2 from pooya1361/master

From Pooya
rr
From Narges 2
Merge branch 'master' of https://github.com/Narrges/Homabookshop
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build/web/build/web/build/web/WEB-INF/classes/beans/BookListBean.class
	build/web/build/web/build/web/build/web/WEB-INF/classes/beans/BookListBean.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/BookBean.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/BookListBean.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/OrderBean.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/ProfileBean.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/ProfileUpdateBean.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/ShoppingBean.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/servlets/ShopServlet.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/tags/ProfileTag.class
	build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/tags/ShoppingCartTag.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/BookBean.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/BookListBean.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/OrderBean.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/ProfileBean.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/ProfileUpdateBean.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/beans/ShoppingBean.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/servlets/ShopServlet.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/tags/ProfileTag.class
	build/web/build/web/build/web/build/web/build/web/build/web/WEB-INF/classes/tags/ShoppingCartTag.class
	build/web/build/web/build/web/build/web/build/web/build/web/login.jsp
	build/web/build/web/build/web/build/web/build/web/build/web/nbproject/private/private.properties
	build/web/build/web/build/web/build/web/build/web/login.jsp
	build/web/build/web/build/web/build/web/build/web/nbproject/private/private.properties
	build/web/build/web/build/web/build/web/dist/bookshop.war
	build/web/build/web/build/web/build/web/login.jsp
	build/web/build/web/build/web/build/web/nbproject/private/private.properties
	build/web/build/web/build/web/dist/bookshop.war
	build/web/build/web/build/web/login.jsp
	build/web/build/web/build/web/nbproject/private/private.properties
	build/web/build/web/dist/bookshop.war
	build/web/build/web/login.jsp
	build/web/build/web/nbproject/private/private.properties
	build/web/dist/bookshop.war
	build/web/login.jsp
	build/web/nbproject/private/private.properties
	dist/bookshop.war
Initializing the repository
Initializing the repository
Readme removed
Merge branch 'master' of https://github.com/pooya1361/PizzaShop