oustanding changes from last time
Merge branch 'master' of github.com:jbroglie/blissbit-web