fixed the load thing
Merge branch 'externalLogin' of https://github.com/thetmkay/bloomboard into externalLogin
fix error in css
fixed merge conflict
Merge branch 'externalLogin' of https://github.com/thetmkay/bloomboard into externalLogin