Refactor DB schema...again
Merge pull request #6 from tough-griff/refactor_db_schema

Refactor DB schema