Finishing touches
Merge branch 'master' of https://github.com/mattbianchi/db-project
Merged changes