brach first changes
brach new file welcome
brach changes in project.xml
Merge branch 'master' of https://github.com/nitinknaik/example

Conflicts:
	project.xml
	trial.rtf