resetting navbar to 54px
Merge branch 'master' of github.com:aristath/shoestrap
re-organizing the file structure