Rules 6-8 implemented
Merge branch 'master' of https://github.com/grill/vindaloo
Merge; Rules 9 and 10 have been implemented