saving good stuff for later maybe
update to master
current user WIP
current user works as expected
Merges route conflicts
Merge pull request #10 from whaambang/merging-oauth

Merging Alan's Oauth