MERGED EVERYTHING MANUALLY and fixed some stuff

Merged Minerva's and my changes by hand because github was being
ignorant
Also fixed some styling inconsistancies such as the logo not fitting in
the div and the collapsed navbar not expanding