String change
Merge branch 'master' of https://github.com/vivianaranha/TestAndroid

Conflicts:
	TestApp/app/src/main/java/com/vivianaranha/testapp/MyActivity.java