added joplin
Merge pull request #70 from martintrojer/master

added joplin