Rails app to merge w master

Yes