Fixed comment formatting
Merge branch 'master' of https://github.com/mavroskardia/codechallenge
Fixed rule deletion
Merge branch 'master' of https://github.com/Haval/codechallenge
Tweaking settings here and there