Added .ico. Updated index.html
Fixed Bootstrap link, changed <ul> to <nav>.
Fix messy indent of <nav> links.
Fix merge conflict.