bug fixes
Merge branch 'master' of github.com:dcorwin/15237hw4
more bug fixes, login is now two buttons, user must select either or