diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..07e6e472c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/bot.js b/bot.js
index 00eb7b9bd..93316ea0a 100755
--- a/bot.js
+++ b/bot.js
@@ -133,6 +133,17 @@ controller.hears(['what is my name','who am i'],'direct_message,direct_mention,m
     });
 });
 
+controller.hears(['who made you'],'direct_message,direct_mention,mention',function(bot, message) {
+
+    controller.storage.users.get(message.user,function(err, user) {
+        if (user && user.name) {
+            bot.reply(message,'' + user.name);
+        } else {
+            bot.reply(message,'Michael');
+        }
+    });
+});
+
 
 controller.hears(['shutdown'],'direct_message,direct_mention,mention',function(bot, message) {