deleted dup database
Merge branch 'master' of https://github.com/ck3908/topics_app
added new comments
trying to resolve conflict