add logo files
Update .gitignore
fix merge conflicts
Merge branch 'master' of https://github.com/reko888/egrow