gave myself recognition
Merge branch 'master' of github.com:bwheeler96/devise-oauth2-provider-rails4
merge