revert back before website broke
merging gh-pages
added last of content
conflicts
merge conflicts
image replacement
git problems