stuff
Merge branch 'master' of https://github.com/joelteon/hoauth2

Conflicts:
	.gitignore
	example/Google/test.hs
	hoauth2.cabal
	src/Network/OAuth/OAuth2/HttpClient.hs
	src/Network/OAuth/OAuth2/Internal.hs