Merge branch 'master' of github.com:markovmodel/pyemma_tutorials into details

Author: brookehus

manuscript/manuscript.tex

@@ -36,7 +36,7 @@
 \author[1\authfn{1}*]{Christoph Wehmeyer}
 \author[1\authfn{1}]{Martin K. Scherer}
 \author[1\authfn{1}]{Tim Hempel}
-\author[2]{Brooke E. Husic}
+\author[1,2]{Brooke E. Husic}
 \author[1]{Simon Olsson}
 \author[1*]{Frank Noé}
 \affil[1]{Department of Mathematics and Computer Science, Freie Universität Berlin, Arnimallee 6, 14195 Berlin, Germany}