Merge pull request #515 from miraai/dev

Names changed

docs/Contribution Guide.md

@@ -4,4 +4,4 @@
 2. Keep 1 Pull Request to a single feature
 3. Explain what you did in the PR message
 
-Thanks for all the help ^_^
+Thanks for all the help ^_^

docs/Custom Reactions.md

@@ -18,4 +18,4 @@ Deletes either whole custom command and all its responses or a single command's
 For example: `.dcr "hi there"` or `.dcr "hi there" 1`. You can get an index by using `.lcr [page number]`
 
 `.lcr [number]` 
-Prints a list of custom reactions. Paginated. (for example: `.lcr 1` or `.lcr 4`)
+Prints a list of custom reactions. Paginated. (for example: `.lcr 1` or `.lcr 4`)

docs/Frequently Asked Questions.md

@@ -37,4 +37,4 @@ FOLLOW THIS DETAILED GUIDE IF IT IS HARD FOR YOU TO UNDERSTAND http://discord.ko
 ####Q18: I'm building NadekoBot from source, but I get hundreds of (namespace) errors without changing anything!?
 A: Using Visual Studio, you can solve these errors by going to Tools -> NuGet Package Manager -> Manage NuGet Packages for Solution. Go to the Installed tab, select the Packages that were missing (usually Newtonsoft.json and RestSharp) and install them for all projects  
 ####Q19: My bot has all permissions but it's still saying, "Failed to add roles. Bot has insufficient permissions.", how do I fix this?
-A: Discord has added few new features and roles now follow hierarchy, that means you need to place your bot role above every-other role your server has. Also do NOTE that bot can only set/add all roles below its own highest role. And can not assign it's "highest role" to anyone else.
+A: Discord has added few new features and roles now follow hierarchy, that means you need to place your bot role above every-other role your server has. Also do NOTE that bot can only set/add all roles below its own highest role. And can not assign it's "highest role" to anyone else.

docs/JSON Explanations.md

@@ -35,4 +35,4 @@
 - **CarbonKey** - carbonitex.net key if your bot is listed there in order to send stats (probably nobody needs this)
 
 Next to your exe you must also have a data folder in which there is config.json (among other things) which will contain some user specific config, like should the Bot join servers, should DMs to bot be forwarded to you and a list of IDs of blacklisted users, channels and servers. If you do not have config.json, you can should config_example.json to config.json.
-```
+```

docs/guides/Building from Source.md

@@ -5,4 +5,4 @@ In your bin/debug folder (or next to your exe if you are using release version),
 
 When you clone the project, make sure to run `git submodule init` and `git submodule update` to get the correct discord.net version
 
-Make sure you've read ComprehensiveGuide to get a grasp of basic config/credentials setup and then look at "Credentials and config" chapter.
+Make sure you've read ComprehensiveGuide to get a grasp of basic config/credentials setup and then look at "Credentials and config" chapter.

docs/guides/OSX Guide.md

@@ -0,0 +1 @@
+##MAC Guide

docs/guides/macguide.md

@@ -1 +0,0 @@
-##MAC Guide