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

Conflicts:
	test/bin/.gitignore
	test/bin/test.drl