develop
Merge branch 'master' of https://github.com/malger/bioinf_exercise_3.git