Updated masterbranch
Merge branch 'master' of https://github.com/mattslavin/test-repo into extra-styling-and-content

* 'master' of https://github.com/mattslavin/test-repo:
  Update to master branch
  Changed main h1 tag in master branch

Conflicts:
	index.html

Need to delete the orig file
Adding another link to styling and content branch
Merge branch 'extra-styling-and-content'

* extra-styling-and-content:
  Adding another link to styling and content branch
  Updated masterbranch

Conflicts:
	index.html