g
Merge branch 'gh-pages' of https://github.com/skauffm/mySecondJekyllSite into gh-pages

Conflicts:
	pageTwo.html
	pagetwo.html
	pagetwo/index.html