Merge pull request #3 from teamTALIMA/master

Merge teamTALIMA:master

index.js

@@ -172,7 +172,7 @@ beastie.on("newFollow", function(follower){
 // HYDRATION-REMINDER - Beastie periodically reminds broadcaster to stay hydrated
 setInterval(function(){
     timers.hydrationReminder();
-}, 1000 * 60 * 1); // 1sec * 60 * 28 = 28min timer
+}, 1000 * 60 * 28); // 1sec * 60 * 28 = 28min timer
 
 // QUOTES - Beastie shares a random quote in chat
 setInterval(function(){
@@ -182,4 +182,4 @@ setInterval(function(){
 // RULES - Beastie posts the channel rules
 setInterval(function(){
     timers.rules();
-}, 1000 * 60 * 60); // 1sec * 60 * 60 = 60min timer
+}, 1000 * 60 * 60); // 1sec * 60 * 60 = 60min timer

readme.md

@@ -1 +1,46 @@
-## teamTALIMA's Beastie Bot
+## teamTALIMA's Beastie Bot
+<sup>*teamTALIMA Project &mdash; [Developed LIVE on twitch.tv/teamTALIMA](https://www.twitch.tv/teamtalima)*</sup>
+
+A bot for Twitch (IRC) chatrooms and Discord servers
+
+
+## Software / Specs
+Beastie is developed with...
+
+-
+-
+-
+
+
+## BeastieBot Features
+Some of Beastie's main features include...
+
+-
+-
+-
+
+
+## Upcoming Features
+These features are soon to be developed, either on stream or merged from collaborating teammate branch
+
+-
+-
+-
+
+
+## Setup for Collaborators
+How to 'git clone' the repo, install node, install npm dependencies, configure secrets.js
+
+
+## Install & Run for Users
+How to download BeastieBot, setup bot channel, configure secrets.js, launch bot (see wiki for how to permanently launch bot)
+
+
+## Collaborators
+Past / Current project collaborators
+Benwurth
+Scryptonite
+
+
+## License
+GNU GPLv3