change text
Merge branch 'master' of git@github.com:javalive09/FullScreen.git

Conflicts:
	res/layout/activity_main.xml