Updated review dalog
hopfully resolved conflict
Merge branch 'master' of https://github.com/softish/DBAssignment

Updated review. Resolved conflict