Apply fix proposed by @phuong-nguyen
Merge pull request #13 from agoragames/omniauth-fixconflict

Conflict with omniauth