merge conflict resolved
Commit
added Simon's bio
Galina's bio edited
Merge pull request #23 from gyermich/submissions

Submissions