img v2
Merge branch 'hackaton' of https://github.com/basvanalphen/estafette into hackaton