commit to dev_1.1 A
Merge branch 'dev_1.1' of https://github.com/charmgranada/try

Conflicts:
	newFile.rtf