small changes
Merge branch 'master' into william
finishing up navbar stlying
trying to merge
Merge pull request #35 from areveal/william

William