Signed-off-by: claire921 <claire921@gmail.com>
merge


Signed-off-by: claire921 <claire921@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/src/Test/TestUtil.java
	HelloWorld/src/com/dicks/engine/Util.java
change fee


Signed-off-by: claire921 <claire921@gmail.com>
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/dao/InventoryDao.java
	HelloWorld/src/com/dicks/dao/OrderDetailDAO.java
	HelloWorld/src/com/dicks/dao/ProductDAO.java
	HelloWorld/src/com/dicks/engine/SmallTest.java