changed paths
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
cname changed to join.eggsdesign.no