Merge branch 'master' of https://ShitSoCash.xxx