settings added
Merge remote-tracking branch 'origin/settings'
deleted all pyc files, we dont need them