continued to add to analysis, modified apps
Merge branch 'master' of https://github.com/shumash/db_project