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

Conflicts:
	HelloWorld/smallTest.log
	HelloWorld/src/Test/TestUtil.java
	HelloWorld/src/com/dicks/engine/Allocate.java
	HelloWorld/src/com/dicks/pojo/Store.java
	HelloWorld/src/com/dicks/rules/newRule_LY.drl
Merge branch 'master' of https://github.com/claire921/dicks.git