tests
Merge branch 'v2' of github.com:dvl/cdzforever.net into v2