Merge branch 'gh-pages' into gh-pages

CNAME

@@ -0,0 +1 @@
+new.vocaluxe.org

README.md

@@ -1,5 +1,5 @@
 # VocaluxeWebsite
-This branch contains our GitHub-Page. It's accessible via https://vocaluxe.github.io/Vocaluxe/ and based on [Jekyll](https://jekyllrb.com/), a popular static site generator.
+This branch contains our GitHub-Page. It's accessible via http://new.vocaluxe.org and based on [Jekyll](https://jekyllrb.com/), a popular static site generator.
 
 ## Working on this website
 For easier working on this website and to not mess around with all other branches, we suggest to clone this as a single-branch. Just follow these steps:

_config.yml

@@ -3,7 +3,7 @@
 
 # NB! Set your site's url, otherwise stuff will break :)
 
-url: "https://vocaluxe.github.io"
+url: "https://new.vocaluxe.org"
 
 # If you're hosting your site at a Project repository on GitHub pages
 # (https://yourusername.github.io/repository-name)
@@ -12,7 +12,7 @@ url: "https://vocaluxe.github.io"
 #
 # NB! Without this *nothing* will work, because it's used in every path :)
 
-baseurl: /Vocaluxe
+baseurl: /
 
 # Google tracking id to track your visitors