Rails barf
Merge branch 'master' of github.com:mikebosco/DarkConfidant