Combine with kevin's split

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

Conflicts:
	HelloWorld/src/com/dicks/engine/ThresTemplate.java
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/ruleTxt/rule4.txt
	HelloWorld/src/com/dicks/engine/ThresTemplate.java
Merge branch 'master' of https://github.com/claire921/dicks.git
Merge branch 'master' of https://github.com/claire921/dicks.git


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