Merge pull request #5 from WybrenKoelmans/master

yep
Merge pull request #6 from WybrenKoelmans/master

forcing error again
open =/= opened
Merge branch 'master' of git@github.com:WybrenKoelmans/ZEN-Compo.git
Merge branch 'master' of git@github.com:ZEN-ben/ZEN-Compo.git