update master with rails