edits
Merge branch 'master' of https://github.com/cameronjacoby/cameronjacoby.github.io

Conflicts:
	.DS_Store
edits