diff --git a/lib/fizzbuzz.rb b/lib/fizzbuzz.rb
index 4746a88..7e4c495 100644
--- a/lib/fizzbuzz.rb
+++ b/lib/fizzbuzz.rb
@@ -1,6 +1,8 @@
 class Fizzbuzz
   def calculate number
-    if number % 3 == 0 && number % 5 == 0
+    if number % 7 == 0
+      'GitHub'
+    elsif number % 3 == 0 && number % 5 == 0 
       'fizzbuzz'
     elsif number % 3 == 0
       'fizz'
diff --git a/spec/fizzbuzz_spec.rb b/spec/fizzbuzz_spec.rb
index 93a63e6..7a58655 100644
--- a/spec/fizzbuzz_spec.rb
+++ b/spec/fizzbuzz_spec.rb
@@ -20,4 +20,10 @@
     it { subject.calculate(15).should eq 'fizzbuzz' }
     it { subject.calculate(30).should eq 'fizzbuzz' }
   end
+  context 'GitHub number' do
+    it { subject.calculate(21).should eq 'GitHub'}
+    it { subject.calculate(35).should eq 'GitHub'}
+    it { subject.calculate(42).should eq 'GitHub'}
+    it { subject.calculate(63).should eq 'GitHub'}
+  end
 end