From 60acf7532d804d1b7cd7f9a5d90680cbe0c6384f Mon Sep 17 00:00:00 2001
From: timsvoice <timsethvoice@gmail.com>
Date: Mon, 12 May 2014 14:08:31 -0400
Subject: [PATCH 1/2] added juniors method

---
 student.rb | 54 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/student.rb b/student.rb
index 514cc09..1894e6b 100644
--- a/student.rb
+++ b/student.rb
@@ -1,30 +1,46 @@
 class Student
+ 
+  attr_reader :first_name, :last_name, :grade
+  def initialize(first_name, last_name, grade)
+    @first_name = first_name
+    @last_name = last_name
+    @grade = grade
+  end
 
-	attr_reader :first_name, :last_name, :grade
-	def initialize(first_name, last_name, grade)
-		@first_name = first_name
-		@last_name = last_name
-		@grade = grade
-	end
+  def senior?
+    grade == 12
+  end
 
-	def senior?
-		grade == 12
-	end
+  def junior?
+    grade == 11
+  end
 
-	def to_s
-		"#{last_name}, #{first_name}"
-	end
+  def to_s
+    "#{last_name}, #{first_name}, #{grade}"    
+  end
 end
 
 def seniors(students)
-	students.select { |student| student.senior? }
+  students.select { |student| student.senior? }
 end
 
-fred = Student.new("Fred", "James", 12)
-sarah = Student.new("Sarah", "Smith", 12)
-jack = Student.new("Jack", "Gong", 11)
-all_students = [fred, sarah, jack]
+def juniors(students)
+  students.select { |student| student.junior? }
+end
+
+tim = Student.new("jack", "gong", 11)
+fred = Student.new("fred", "james", 12)
+jane = Student.new("sarah", "smith", 12)
+all_students = [tim, fred, jane]
+
+puts "Seniors"
 
 seniors(all_students).each do |student|
-	puts student
-end
+  puts student
+end 
+
+puts "Juniors"
+
+juniors(all_students).each do |student|
+  puts student
+end 
\ No newline at end of file

From 8c94e2aa97379daee6d1d68ce6f79620daa52157 Mon Sep 17 00:00:00 2001
From: timsvoice <timsethvoice@gmail.com>
Date: Mon, 12 May 2014 14:12:25 -0400
Subject: [PATCH 2/2] inserted juniors method

---
 student.rb | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/student.rb b/student.rb
index 1894e6b..5092d8b 100644
--- a/student.rb
+++ b/student.rb
@@ -1,46 +1,46 @@
 class Student
- 
-  attr_reader :first_name, :last_name, :grade
-  def initialize(first_name, last_name, grade)
-    @first_name = first_name
-    @last_name = last_name
-    @grade = grade
-  end
 
-  def senior?
-    grade == 12
-  end
+	attr_reader :first_name, :last_name, :grade
+	def initialize(first_name, last_name, grade)
+		@first_name = first_name
+		@last_name = last_name
+		@grade = grade
+	end
+
+	def senior?
+		grade == 12
+	end
 
-  def junior?
+	def junior?
     grade == 11
   end
 
-  def to_s
-    "#{last_name}, #{first_name}, #{grade}"    
-  end
+	def to_s
+		"#{last_name}, #{first_name}"
+	end
 end
 
 def seniors(students)
-  students.select { |student| student.senior? }
+	students.select { |student| student.senior? }
 end
 
 def juniors(students)
   students.select { |student| student.junior? }
 end
 
-tim = Student.new("jack", "gong", 11)
-fred = Student.new("fred", "james", 12)
-jane = Student.new("sarah", "smith", 12)
-all_students = [tim, fred, jane]
+fred = Student.new("Fred", "James", 12)
+sarah = Student.new("Sarah", "Smith", 12)
+jack = Student.new("Jack", "Gong", 11)
+all_students = [fred, sarah, jack]
 
 puts "Seniors"
 
 seniors(all_students).each do |student|
-  puts student
-end 
+	puts student
+end
 
 puts "Juniors"
 
 juniors(all_students).each do |student|
   puts student
-end 
\ No newline at end of file
+end
\ No newline at end of file