updated booklist
Merge branch 'gh-pages' of https://github.com/jebberjeb/pastorplants.com into gh-pages

Conflicts:
	booklist.txt
fixed book title
Merge branch 'gh-pages' of https://github.com/jebberjeb/pastorplants.com into gh-pages
adding apache to setup
updated booklist
Merge branch 'gh-pages' of https://github.com/jebberjeb/pastorplants.com into gh-pages
fixing paths
updated books
updated booklist
Merge branch 'gh-pages' of https://github.com/jebberjeb/pastorplants.com into gh-pages

Conflicts:
	booklist.txt
added books
updated resume to use gist
Merge branch 'gh-pages'

Conflicts:
	setup.sh