haha
asfds
Merge branch 'master' of https://github.com/claire921/dicks

Conflicts:
	test/bin/test.drl
	test/src/main/java/com/sample/Package.java
	test/src/main/rules/newRule.drl
	test/src/main/rules/test.drl