aesthetic surgery in setup.sh
Made .gitignore more conservative
setup.sh fine tuning
Merge pull request #1 from A2-Collaboration/master

test