merging changes with master also unwanted files removed
Merge branch 'master' of https://github.com/TaviscaSolutions/yellow-repo