Merge branch 'master' of github.com:reality/depressionbot

modules/poll.js

@@ -1,8 +1,4 @@
 var poll = function(dbot) {
-    if(!dbot.db.hasOwnProperty('polls')) {
-        dbot.db.polls = {};
-    }
-
     var polls = dbot.db.polls;
     var commands = {
         '~newpoll': function(event) {

run.js

@@ -42,6 +42,9 @@ var DBot = function(timers) {
     if(!this.db.hasOwnProperty("ignores")) {
         this.db.ignores = {};
     }
+    if(!this.db.hasOwnProperty('polls')) {
+        this.db.polls = {};
+    }
     
     // Load Strings file
     this.strings = JSON.parse(fs.readFileSync('strings.json', 'utf-8'));