Merged facebook and google omniauth.
Adjusted version of oauth.
Merge branch 'master' of https://github.com/krytlewski/remory

Conflicts:
	db/schema.rb