Untrack trash
Ignore trash
Pycache removal
Merge branch 'master' of https://github.com/vdrhtc/Conductivity.git