satsh 2
Merge branch 'develop' of https://github.com/upendratarnoju/hello1.git into develop
stash 3
second
Merge branch 'develop' of https://github.com/upendratarnoju/hello1.git
into develop

Conflicts:
	hello1/src/com/example/hello1/MainActivity.java