merge gh-pages back into master
still attempting to merge. Just following directions
Merge branch 'master' into luckyII_jekyll_blog