fix pages not loading
question 1
Merge branch 'master' of github.com:dvd545/218finalproject

local merge 2