added navbar
deleted application.css.scss
Merge branch 'master' of https://github.com/z22/mz