CSU student, oil company reach agreement on civil lawsuit filed following protest