Oauth with google added
Merge branch 'master' of https://github.com/netlinksclubs/devFest

Conflicts:
	app/routes.php
Fixed
Ignore