Changes for dashborad
Fixed merge conflict
Changes in log viewer
Merge branch 'master' of github.com:AkarshES/Final-Sem-Project
changes