more stuff
Merge branch 'master' of github.com:mathiasose/eeds