page update
fixed conflict
updating pages
updating
basic layout for interior pages
Merge branch 'master' into gh-pages

pdating pages from master
Merge branch 'master' of github.com:jayperryworks/petting-zoo