moving files
Merge branch 'develop' of https://github.com/arwidt/eggit into develop