Deleted useless file
fix conflicts
Merge branch 'master' of https://github.com/spyl94/znieh