Woo, OAuth!
Merge Github's useful boilerplate

Conflicts:
	README.md