set up tables and migrations
Merge branch 'master' into yash
Merge branch 'master' into alex
tweeked controller and view