Resolving Conflicts
Merge branch 'master' of https://github.com/ravjotsingh9/DBLike.git
Merging my part back
Merge branch 'master' of https://github.com/ravjotsingh9/DBLike.git