Merging changes
Merge branch 'master' of https://github.com/mavroskardia/codechallenge
Fixed rule modification
Merge pull request #18 from Haval/master

I can't believe you did this...