this new activity added
deleted the activity 2
deleted the activity 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/AndroidManifest.xml
manage work