presentation, added ability to buffer and remove html
Merge branch 'master' of https://github.com/nadinebo/CPSC304
master merge for stew and nicoles work