Merge branch 'John'
index.html main.css dashboard.css footer fix

and link formatting
Merge branch 'master' into John
update main.css typo and color

fixed navbar height typo and changed a hover link color
Merge branch 'master' into John