changes from mark's computer
pulled changes from origin develop
commented out the ruby version
sorted nil object errors