Merge branch 'neuralnets' of sissource.ethz.ch:sispub/courses/machinelearning-introduction-workshop into neuralnets