initial commit
updated db schema
merged conflicts