merge conflit destroyed everything so adding oauth stuff again.
have to start handling for users on server side now
Merge pull request #49 from paulyi326/dev

merge conflit destroyed everything so adding oauth stuff again.