ready to pull
Merge branch 'master' of github.com:berc-web/berc_web
more styling fix