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

Conflicts:
	HelloWorld/bin/com/dicks/rules/newRule_joe.drl
	HelloWorld/src/com/dicks/rules/newRule_joe.drl
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/com/dicks/pojo/Product.java