fixing messed up merge for home.ejs oops
Merge branch 'master' of https://github.com/amstone326/PennBook

merge.