First merge conflict, now we're working
merge branch 'master' of https://github.com/schordas/Jata
Why did you edit main greg