working with oauth
fixing merge conflicts
oauth is working, but with password issues
fixing merge conflicts
fixing merge conflicts
oauth works
Merge pull request #12 from ncaskey04/dev

oauth works