commit
Merge branch 'master' of https://github.com/Diya20/MyTesting

Conflicts:
	FragmentsTest/src/com/example/android/fragments/MainActivity.java