changed 2 line
sarava done
clean commit
Merge remote-tracking branch 'origin/master'

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