micky
micky
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/dao/ProdCateDAO.java
	HelloWorld/src/com/dicks/engine/Ordersssssss.java
	HelloWorld/src/com/dicks/engine/Split.java
	HelloWorld/src/com/dicks/engine/createRule.java
	HelloWorld/src/struts.xml
Merge branch 'master' of https://github.com/claire921/dicks.git