Correct conflit of README
Merge branch 'master' of github.com:danieltex/boolexp