oauth2 try1
Merge branch 'master' of github.com:codeartists/stinking-pig

Conflicts:
	app.rb