adds basic google auth
Merge branch 'master' of github.com:clemensp/majordomo

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb