useless last hour of my work/life
fixed merge conflict, styled header, added vendor admin button
Merge branch 'master' of https://github.com/katke/mano