changes ie my variables and navbar settings made, logo
Merge branch 'master' of https://github.com/clarakim/my-boilerplate
nav bar