add x setup.sh
Merge remote branch 'origin/master'