added css and div things
resolving conflict
changed css
Merge branch 'master' of https://github.com/WinfredMusyoki/ReportingGroup3