Pre-merge
Merge branch 'master' of https://github.com/GLoganDR/furry-farm into show-pages
post merge
Fixed misc errors
Fixed jQuery
Merge pull request #6 from GLoganDR/show-pages

Show pages