add more code for merging templates

Changes to be committed:

	modified:   setup.sh