Changes in rule
Merge branch 'master' of https://github.com/helloworld987/firstOne
Rule changes
Merge branch 'master' of https://github.com/helloworld987/firstOne

Conflicts:
	src/Rules.java
Code for dropbox