diff --git a/lib/fizzbuzz.rb b/lib/fizzbuzz.rb
index 4746a88..b4220df 100644
--- a/lib/fizzbuzz.rb
+++ b/lib/fizzbuzz.rb
@@ -1,7 +1,10 @@
 class Fizzbuzz
   def calculate number
     if number % 3 == 0 && number % 5 == 0
-      'fizzbuzz'
+      if number.to_s.include? '7'
+        'Github'
+      elsif number % 3 == 0 && number % 5 == 0
+        'FizzBazz'
     elsif number % 3 == 0
       'fizz'
     elsif number % 5 == 0
diff --git a/spec/fizzbuzz_spec.rb b/spec/fizzbuzz_spec.rb
index 93a63e6..0efdd82 100644
--- a/spec/fizzbuzz_spec.rb
+++ b/spec/fizzbuzz_spec.rb
@@ -20,4 +20,9 @@
     it { subject.calculate(15).should eq 'fizzbuzz' }
     it { subject.calculate(30).should eq 'fizzbuzz' }
   end
+  context 'Github number' do
+    it { subject.calculate(17).should eq 'github'}
+    it { subject.calculate(27).should eq 'github'}
+    it { subject.calculate(75).should eq 'github'}
+    it { subject.calculate(77).should eq 'github'}
 end