Text Editor works
Fix Todds and Bobbys merge conflicts in css/custom.css and index.html