Should fix the oauth
Merge branch 'master' of github.com:ZeusWPI/gamification

Conflicts:
	config/secrets.yml