added oauth google
Merge branch 'master' of https://github.com/rnecesito/vetro

Conflicts:
	client/templates/oauth.html
Merge branch 'master' of https://github.com/rnecesito/vetro

Conflicts:
	client/client.js
	client/templates/oauth.html
	server/config.js