Initial commit
Merge branch 'master' of https://github.com/mioxin/My_Application

Conflicts:
	app/src/main/java/com/example/mmm/myapplication/MyActivity.java
Initial commit