From a4f9340c6b4d63f4a5693cf1b82b0b74672939c4 Mon Sep 17 00:00:00 2001
From: Harrison Gill <harrisongill@mac.com>
Date: Fri, 6 Dec 2013 18:38:40 +0100
Subject: [PATCH 1/3] Add juniors, sophomores, and freshmen

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

diff --git a/student.rb b/student.rb
index 514cc09..394672f 100644
--- a/student.rb
+++ b/student.rb
@@ -11,8 +11,20 @@ def senior?
 		grade == 12
 	end
 
+	def junior?
+		grade == 11
+	end
+
+	def sophomore?
+		grade == 10
+	end
+
+	def freshman?
+		grade == 9
+	end
+
 	def to_s
-		"#{last_name}, #{first_name}"
+		"#{first_name}, #{last_name}"
 	end
 end
 
@@ -20,11 +32,41 @@ def seniors(students)
 	students.select { |student| student.senior? }
 end
 
+def juniors(students)
+	students.select { |student| student.junior? }
+end
+
+def sophomores(students)
+	students.select { |student| student.sophomore? }
+end
+
+def freshmans(students)
+	students.select { |student| student.freshman? }
+end
+
 fred = Student.new("Fred", "James", 12)
 sarah = Student.new("Sarah", "Smith", 12)
 jack = Student.new("Jack", "Gong", 11)
-all_students = [fred, sarah, jack]
+george = Student.new("George", "Washington", 10)
+abraham = Student.new("Abraham", "Lincoln", 9)
+all_students = [fred, sarah, jack, george, abraham]
 
 seniors(all_students).each do |student|
+	puts "Seniors:"
+	puts student
+end
+
+juniors(all_students).each do |student|
+	puts "Juniors:"
+	puts student
+end
+
+sophomores(all_students).each do |student|
+	puts "Sophomores:"
+	puts student
+end
+
+freshmans(all_students).each do |student|
+	puts "Freshmen:"
 	puts student
 end

From 13ecf1e173dd2b29591cdcd4ab1b72a01e189857 Mon Sep 17 00:00:00 2001
From: Harrison Gill <harrisongill@mac.com>
Date: Fri, 6 Dec 2013 18:53:14 +0100
Subject: [PATCH 2/3] Fix last name, first name name order

---
 student.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/student.rb b/student.rb
index 394672f..2bbe653 100644
--- a/student.rb
+++ b/student.rb
@@ -24,7 +24,7 @@ def freshman?
 	end
 
 	def to_s
-		"#{first_name}, #{last_name}"
+		"#{last_name}, #{first_name}"
 	end
 end
 

From a090486abc7671c9af562047a2ef8a50c6fee627 Mon Sep 17 00:00:00 2001
From: Harrison Gill <harrisongill@mac.com>
Date: Fri, 6 Dec 2013 18:55:51 +0100
Subject: [PATCH 3/3] Remove duplicate categories

---
 student.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/student.rb b/student.rb
index 2bbe653..a085760 100644
--- a/student.rb
+++ b/student.rb
@@ -51,22 +51,22 @@ def freshmans(students)
 abraham = Student.new("Abraham", "Lincoln", 9)
 all_students = [fred, sarah, jack, george, abraham]
 
+puts "Seniors:"
 seniors(all_students).each do |student|
-	puts "Seniors:"
 	puts student
 end
 
+puts "Juniors:"
 juniors(all_students).each do |student|
-	puts "Juniors:"
 	puts student
 end
 
+puts "Sophomores:"
 sophomores(all_students).each do |student|
-	puts "Sophomores:"
 	puts student
 end
 
+puts "Freshmen:"
 freshmans(all_students).each do |student|
-	puts "Freshmen:"
 	puts student
 end