psycho work and little things
Merge branch 'gh-pages' of github.com:ACReeser/gh-pages-template into gh-pages