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

Conflicts:
	newFile.rtf
commit to dev_1.2 D
commit to dev_1.2 E
Merge branch 'dev_1.2' of https://github.com/charmgranada/try
initial commit branch dev_1.0