Merge conflicts
Merge branch 'master' of https://github.com/richelbilderbeek/EegCourse2014FindingGene
Merge conflicts