cleaning the repo and improving DiscoMac.sh
cleaning again
merging
merged