simple text size and all caps to demo merge conflict
Merge branch 'master' into GIT_MERGE_BRANCH_2

Conflicts:
	myapp/app/src/main/res/layout/activity_my.xml
Merge pull request #2 from iwillcode/GIT_MERGE_BRANCH_2

simple text size and all caps to demo merge conflict