Completed entity implementation, database should function correctly.
Merge branch 'HEAD' of https://github.com/mattserrano/Barista-matic.git into HEAD