Merge branch 'master' of https://github.com/MayoristasNicas/Mayoristasproject

Conflicts:
	MayoristasNicas_1stVersion/src/java/cart/DB_Conn.java
	MayoristasNicas_1stVersion/src/java/database/DB_Conn.java
	MayoristasNicas_1stVersion/web/index.jsp