Made clean.sh use rm -rf
Merge remote-tracking branch 'origin/master' into resources