Changed CNAME
Merge branch 'master' into gh-pages

Signed-off-by: Nils Torbjörn Petersen <kontakt@entepe.de>

Conflicts:
	CNAME
Merge branch 'develop' into gh-pages

Signed-off-by: Nils Torbjörn Petersen <kontakt@entepe.de>
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Styling...
Merge branch 'develop' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	css/entepe.css
Minified main js