fixed offcanvas & navbar
fixed conflicts
Merge pull request #7 from Calliejb/cdangbranch2

fixed offcanvas & navbar