Initial commit
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	app/src/main/java/com/example/administrator/test1/MyActivity.java