Merge branch 'master' into dev

Author: john-h-k

README.md

@@ -3,14 +3,12 @@
 ## Documentation:
 
 
-## To do:
-* [AES](https://github.com/johnkellyoxford/EncryptionApp/tree/master/Encryption%20App/AES):
-  *   decryption algorithm and move to seperate file
+## To do
 * RSA
 * Incorporate microsoft data protector
 * .crypt header files
 * Create documentation and tutorial
 * create a microsoft installer application with certificates --> trust
 * Sell rip-off usb drives with this content on
 
-Copied this from John's cause why not
+"Copied this from John's cause why not" @nightraven3142