ugh
fixed conflict
merged in from master
merge in new navbar
i hate git
temp stop of carousel
merging in new nav stuff
fixed folder rename