clase de video juegos.
Merge branch 'master' of https://github.com/edgaruriel/optVideoGame

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/testandroid/R$layout.class
	bin/classes/com/example/testandroid/R$menu.class
	bin/classes/com/example/testandroid/R$string.class
	bin/classes/com/example/testandroid/R$style.class
	bin/classes/com/example/testandroid/R$styleable.class
	bin/classes/com/example/testandroid/TouchActivity.class
	bin/jarlist.cache
	bin/optVideoGame.apk
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/example/testandroid/R.java
	project.properties
	res/values/strings.xml