begin working on book for bad ores
Merge remote-tracking branch 'origin/master'