database username
Merge branch 'master' of https://github.com/jcap49/mobile_zen
Merge branch 'master' of https://github.com/jcap49/mobile_zen
fixed merge conflicts
more merge conflict fixes
removed bootstrap from app scss