OAuth works
Merge branch 'oauth'

Conflicts:
	package.json