Added in Better handeling of db
Merge branch 'master' of github.com:davidlibbyFIT/Libby