Merge pull request #29 from margaretgodowns/margaretH1

Margaret h1
merge conflict demo
demoing
resolved merge