Merge branch 'master' into 'V12'

# Conflicts:
#   .gitignore
#   commands/admin/tag.js
#   commands/utility/taglist.js
#   listeners/message.js
#   package.json

.gitignore

@@ -1,5 +1,4 @@
 config.json
-package-lock.json
 .DS_Store
 node_modules
 node_modules\

README.md

@@ -0,0 +1,52 @@
+
+# Haha Yes
+
+A multi function discord bot.
+
+## Getting Started
+
+These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
+
+### Prerequisites
+
+You need to install the following
+
+```
+https://github.com/Automattic/node-canvas
+https://github.com/tojocky/node-printer
+```
+
+### Installing
+```
+git clone https://gitlab.com/loicbersier/discordbot
+cd discordbot
+npm init -y
+npm install
+```
+To run the bot either use pm2
+```
+npm install -g pm2
+pm2 start index.js --name(insert name)
+```
+or node
+```
+node index.js
+```
+## Built With
+
+* [Discord.JS](https://github.com/discordjs/discord.js) - The discord api used
+* [Discord-Akairo](https://github.com/1Computer1/discord-akairo) - The framework used for Discord.JS
+
+## Authors
+
+* **Loïc Bersier**
+
+## License
+
+This project is licensed under the **GNU General Public License v2.0** License - see the [LICENSE](LICENSE) file for details
+
+## Acknowledgments
+
+* discord.JS team
+* 1computer1 for discord-akairo
+* Tina the Cyclops girl#0064 for inspiring me for making this bot

package.json

@@ -2,15 +2,7 @@
   "name": "hahayes",
   "version": "2.1.0",
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
   "dependencies": {
-    "@discordjs/uws": "^11.149.1",
-    "@google-cloud/text-to-speech": "^0.4.0",
     "auto-reload": "^0.1.0",
     "canvas": "^2.2.0",
     "discord-akairo": "github:1Computer1/discord-akairo#master",