rearranged
Merge branch 'gh-pages' of https://github.com/pruitt/Gitfun into gh-pages