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

Conflicts:
	HelloWorld/src/com/dicks/pojo/Rule.java
Merge branch 'master' of https://github.com/claire921/dicks.git
micky
Merge branch 'master' of https://github.com/claire921/dicks.git