Hello.
Merge branch 'master' of github.com:otomoringo/GitPractice

Conflicts:
	res/values/strings.xml