add some database relationships
fixed master merge conflict and ready to push
Merge pull request #15 from ChasevanHekken/add_some_DB_shit

Add some db shit