ghpages
Merge branch 'master' of https://github.com/bethanyprevatt/projectredesign

Conflicts:
	.DS_Store