refactoring oauth
fixing merge conflicts with routes
integrated oauth and login steps
Merge pull request #18 from ncaskey04/dev

integrated oauth and login steps