base temp login bootstrap
fix conflict for jeff first commit
Merge pull request #4 from JohannaMW/jeff_dev

Jeff dev