added till hamm
Merge branch 'master' of github.com:trigremm/rosalind