git problems
Merge branch 'newgen-muradyan' of https://github.com/d3scomp/JDEECo into newgen-muradyan