WEed
Merge branch 'non_heroku' of https://github.com/psyfog/rails4-pundit-heroku into non_heroku