chpt 4 finished
Merge branch 'master' of https://github.com/edwindj/editrules
layout tweak