implemented database relationships and implemented database into our view
fixed merge conflicts
Merge pull request #17 from ChasevanHekken/more_database_work

More database work