Merge pull request #73 from GroundApps/juanito003-master

Juanito003 master

close #72

Author: Malte Kiefer

README.md

@@ -13,10 +13,18 @@ You can either use MySQL or SQLite. SQLite is easier to set up.
 
 ####Installation
 If you use Ubuntu you can use the [PPA](https://launchpad.net/~jklmnn/+archive/ubuntu/groundapps) by executing `add-apt-repository ppa:jklmnn/groundapps`.  
+<<<<<<< HEAD
 To install the backend manually , go to http://your.path/.
 Fill up the form, click on create!
+=======
+To install the backend manually, go to http://your.path/  
+Fill up the form, click on create!  
+>>>>>>> 2b7db66613913c8f67ed7ccd80fcef54cd1da438
 That's all.
 
+https is currently not supported for self-signed certificates.  
+See the [wiki](https://github.com/GroundApps/ShoppingList/wiki) for more informations about installation and roadmap.
+
 ## Feedback
 Please do never hesitate to open an issue!<br>
 I know there a some bugs, most likely because I had no idea how to do it otherwise and therefore had to use a workaround.