pushed footer to the bottom everywhere, fix merge conflicts
export bootstrap changes to new file