bug squashing
Merge branch 'master' of github.com:csahlman/bss_portal