about to start merge with julian
Merge branch 'master' of https://github.com/ssamot/vgdl_competition