removed double ups after renaming
removed remaining *
removed tabs and MM / MWL
Merge remote-tracking branch 'origin/master'