starting with effects
fixing conflicts
Merge branch 'master' of https://github.com/EssexUniversityMCTS/java-vgdl