Local change on office computer
Merge with github version
Added setup.sh
Added setup.sh