Merge pull request #1 from zagadooga/dannyg

Dannyg
finished database schema
Merge pull request #2 from zagadooga/alec

finished database schema