mergefix
mergefix
merge timelines
Merge branch 'master' of https://github.com/RKim220/project4
merge fix
Merge branch 'master' of https://github.com/RKim220/project4
Merge branch 'master' into ryan-foundation
fix merge
merge conflicts
merge fix
merge fix
slide bar added
precompile asset locally
update font and navslide
trying out bg colors
update styling
merge conflict resolve
Merge pull request #44 from RKim220/navbar-slide-css-only

Navbar slide css only
resolve merge conflicts