first commit of the homepage
aded h1
added <p> to index
added some headlines
different <p> on master
new <p> text to test merge conflicts
changed <h1>
Merge branch 'master' of https://github.com/kirstyburgoine/test-stuff