updates to environment.rb and student.rb
resolved conflicts in students.rb, environment.rb