commit sci1test1 ex3
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestSelf/src/main/AndroidManifest.xml
Merge remote-tracking branch 'origin/master'
commit sci1test1 ex3