messed around with ruby
fixed merge conflict
jes committing for jc who is on the phone