From eclipse
Merge branch 'master' of
https://github.com/challarao/SampleGitMaster.git

Conflicts:
	sample2