hi there incremental yera change so i can pull
finish the very basic implementation of
Merge branch 'master' of
https://github.com/ronaldsmartin/APO-DZ-Android.git

Conflicts:
	APO-DZ/res/values/strings.xml