lots o changes
Merge branch 'master' of github.com:flyingmachine/brave-clojure-web