Merge branch 'master' of gitlab.ethz.ch:thealternative/website

1 job for master in 12 seconds (queued for 2 seconds)