placeholder
Merge branch 'gh-pages' of https://github.com/mdevans1/mygithubpage into gh-pages

Conflicts:
	index.html

Initial merge