enriching setup script
Merge branch 'gh-pages'

Conflicts:
	setup.sh
Merge pull request #1 from jebberjeb/master

enriching setup script