added not very successful attempts to get rules working well
Merge branch 'master' of https://github.com/wihl/cs181-spring2014