Merge branch 'master' of https://github.com/elliotanderson13/booksmart1
Giving in and including my database.php file…sorry