Deleted conflicting files
Merge branch 'master' of https://github.com/tini103/wismatamu-1
Deleted conficted files