diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..479880f4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/node_modules
+/.idea
\ No newline at end of file
diff --git a/bot.js b/bot.js
index 00eb7b9bd..fda753340 100755
--- a/bot.js
+++ b/bot.js
@@ -171,7 +171,7 @@ controller.hears(['uptime','identify yourself','who are you','what is your name'
 
 controller.hears(['fibonacci'], 'direct_message,direct_mention,mention', function(bot, message) {
     if (message.text === 'fibonacci') {
-        bot.reply(message, '1, 1, 2, 3, 5, 8, 13, 21, 34, 55');
+        bot.reply(message, '1, 1, 2, 3, 5');
     }
 });
 
@@ -184,17 +184,28 @@ controller.hears(['fibonacci ([0-9]+)'], 'direct_message,direct_mention,mention'
         bot.reply(message, 'That is not a Fibonacci number!');
     }
     else {
-        bot.reply(message, fibonacci.slice(fibonacci.length-10,fibonacci.length).join(', '));
+        var a = fibonacci[fibonacci.length-1];
+        var b;
+        if(fibonacci.length>1){
+            b=fibonacci[fibonacci.length-2];
+        }else{
+            b=0;
+        }
+        var nextFive = [];
+        for(var i = 0; i<5; i++){
+            nextFive.push(a+b);
+            b = a;
+            a = nextFive[i];
+        }
+        bot.reply(message, nextFive.slice(0,nextFive.length).join(', '));
     }
 });
 
 function calculateFibonacciUpto(goal) {
     var fibonacci = [1, 1];
-    
     while (fibonacci[fibonacci.length-1] < goal) {
         fibonacci.push(fibonacci[fibonacci.length-2] + fibonacci[fibonacci.length-1]);
     }
-    
     return fibonacci;
 }