readme
Merge branch 'master' of https://github.com/peacekeeper/b-torial.git