Merge pull request #15 from natashashannon/master

Created database tables
Merge remote-tracking branch 'upstream/master'