fix more merge conflicts with Brett's font work; add two new fonts to font block
fix more merge conflicts with Brett's font work; add two new fonts to font block

tangrams/eraser-map,tangrams/bubble-wrap,tangrams/eraser-map,tangrams/bubble-wrap