fixed conflicts

.env

@@ -1 +0,0 @@
-CLIENT_TOKEN='NzY0MzQ3MDU1MDUyNTU0MjUx.X4E7qg.-QPXIJrkXqmV2orIuiui0zRbYQw'

.env-b

@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+CLIENT_TOKEN='NzY0MzQ3MDU1MDUyNTU0MjUx.X4E7qg.-QPXIJrkXqmV2orIuiui0zRbYQw'
+=======
+CLIENT_TOKEN='YOUR TOKEN'
+>>>>>>> 4f7d5016012461d1bddd7d15016cdea312b5b7e2

README.md

@@ -1,2 +1,22 @@
 # Brown-Town
 A Discord welcome bot (with plans to be a moderation bot in the future as well)
+
+The current feature list follows:
+
+### Features
+
+Note that Brown Town is still early in development. Things are bound to change.
+
+- [x] Send a welcome message when someone joins your Discord guild
+- [x] Set a custom status for the bot
+
+### Planned Features
+
+- [ ] Add an option to send a DM to new guild members
+- [ ] Add naughty word filters
+- [ ] More to come
+
+### Using the bot in your server
+Currently, I don't host the bot publicly for people to use however, you can host it yourself.
+To do that, simply run change the discord token in the .env file (for example `nano .env`) to the token for the bot you created in the Discord developer portal.
+If you don't know how to create a bot in the Discord developer portal you can look it up, there are many guides. Next, you need to edit index.js, find the line that says const channelId and then change the ID there to your channel ID. Now simply run `node index.js` and then you're done.

index.js

@@ -10,7 +10,7 @@ const bot = new Client({
 
 bot.on('ready', () => {
   console.log(`Logged in as ${bot.user.tag}!`);
-  bot.user.setActivity(`welcome to my town!`, {type: 'PLAYING'});
+  bot.user.setActivity(`reach for the sky and wave hi`, {type: 'PLAYING'});
 });
 
 bot.on('guildMemberAdd', (member) => {