modify this file
Merge branch 'xms' of github.com:romeici/experiment into xms

Conflicts:
	new.sh