testing pull requests
Merge pull request #1 from eressea/master

my first pull request