working on google oauthwq
Merge branch 'master' of github.com:calo81/muser

Conflicts:
	Gemfile