Merge branch 'master' of https://github.com/ced44/MyFirstTest

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/icarjs/myfirsttest/MyActivity.java
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/values/strings.xml