Merge branch 'master' of https://github.com/AlbertMN/AssistantCompute…

…rControl

README.md

@@ -1,11 +1,11 @@
 # AssistantComputerControl
 Control your computer using your **Google Home**, **Amazon Alexa** and **Microsoft Cortana** assistants!
 
-_The git repository is currently not up to date. Having merging issues. Download from [acc.albe.pw](https://acc.albe.pw/)_
+_TLDR; download at [assistantcomputercontrol.com](https://assistantcomputercontrol.com/)_
 
 This is a simple but powerful tool that allows you to perform tasks on your Windows computer like;
 ### Supported computer actions
-* **Full and better list of what ACC can do [can be found here](https://acc.albe.pw/#what-can-it-do)**
+* **Full and better list of what ACC can do [can be found here](https://assistantcomputercontrol.com/#what-can-it-do)**
 * Shutdown [[GH](https://ifttt.com/applets/W3b7fykE-acc-shut-down-computer)][[Alexa](https://ifttt.com/applets/pCPWA7je-acc-shut-down-computer)]
 * Open a file (or multiple) [[GH](https://ifttt.com/applets/Pny8DKBL-acc-open-file-example)][[Alexa](https://ifttt.com/applets/EsP6zWpe-acc-open-file-example)]
 * Restart [[GH](https://ifttt.com/applets/nsvdVxZ9-acc-restart-computer)][[Alexa](https://ifttt.com/applets/kkwxdE9T-acc-restart-computer)]
@@ -26,26 +26,26 @@ This is a simple but powerful tool that allows you to perform tasks on your Wind
 This software only works on Windows and has yet only been tested on Windows 10, 8 & 7.
 
 ## Install
-Setting up AssistantComputerControl is a _piece of cake!_ It only takes about 2 minutes. You just [download the latest version](http://acc.albe.pw/) to your computer, open it and the setup guide will take you through the very short setup guide!
+Setting up AssistantComputerControl is a _piece of cake!_ It only takes about 2 minutes. You just [download the latest version](https://assistantcomputercontrol.com/) to your computer, open it and the setup guide will take you through the very short setup guide!
 
 _Note: [IFTTT](https://ifttt.com/) and a [Dropbox](https://www.dropbox.com/) account is required for the default setup. Dropbox will need to be running at all times for ACC to work_
 
 ## Adding actions
 When the setup is done, all there's left to do is enable as many actions as you like! An "action" is executed on your computer, so enabling the "shutdown" action will allow you to shut down your computer using your assistant!
 
 Scroll to the start of this article for a link-list of all the supported actions!
-Or visit the ["Actions"](https://github.com/AlbertMN/HomeComputerControl/wiki/Actions) article in the Wiki for a more detailed look at what actions are, what they do and how they work.
+Or visit the ["Actions"](https://acc.readme.io/docs/actions) article in the Wiki for a more detailed look at what actions are, what they do and how they work.
 
 ---
 
-If you want more freedom and set all of this up yourself you can do that! [Here](https://github.com/AlbertMN/AssistantComputerControl/wiki/Manual-setup) is a guide on how to manually set up the software (also fairly simple), which allows you to decide where the software is on your computer and much more.
+If you want more freedom and set all of this up yourself you can do that! [Here](hhttps://acc.readme.io/docs/application-advanced-settings-expert-setup) is a guide on how to manually set up the software (also fairly simple), which allows you to decide where the software is on your computer and much more.
 
-For more nerdy technical info you can go to the [Wiki](https://github.com/AlbertMN/AssistantComputerControl/wiki) and take a look at the other articles as well.
+For more nerdy technical info you can go to the [Wiki](https://acc.readme.io/docs/) and take a look at the other articles as well.
 
 So as you can see no coding is required! But if you're up for it and want to add your own features to the project it's easy! The entire project is made made in C# and the code is opensource and quite simple, so feel free to use the code in your own fork or even better; submit pull requests!
 
-### Things ACC likes
-* Huge thanks to [readme.io](https://readme.io/) and [Advanced Installer](https://www.advancedinstaller.com/) for letting us use their services for free, giving back to the opensource community
+### Services and people we like
+* Huge thanks to [readme.io](https://readme.io/) and [Advanced Installer](https://www.advancedinstaller.com/) for letting us use their services for free, giving back to the open source community
 * [Json.NET](https://www.newtonsoft.com/json); free Json library for .NET
 * [Sentry.IO](https://sentry.io/welcome/); great issue-tracking making it much easier to resolve issues
 * _Software based on idea by YouTuber [Hylke Jellema](https://www.youtube.com/user/hylke101)'s [video](https://www.youtube.com/watch?v=gOt1IyEAIxA)_