begin user oauth
resolve merge conflicts
delete unnecessary files
delete more
resolve merge conflicts
Merge pull request #4 from StevenHarlow/setup-user-oauth

Setup user oauth