adding dialog to choose key or login
merge conflict, prompts user for key or username
clean up code
Merge pull request #42 from bdonald25/loginKey

If not logged it, asks if user wants to login or use key