Fix merge

delete files and duplicates
Merge branch 'master' of https://github.com/odran037/odran037.github.io