deleted bootstrap file
navbar added
favicon added image folder change
fixed merge conflicts in index.html