added pipebomb
Merge branch 'master' into patrick-html_work