wtf is going on?
Merge branch 'wtf_rails'
okay, back on track