modified:   .gitattributes
	modified:   .gitignore
        modified:   myfirstapp/AndroidManifest.xml
	modified:   myfirstapp/gen/com/example/myfirstapp/R.java
	modified:   myfirstapp/res/layout/activity_fullscreen.xml
	modified:   myfirstapp/res/values-v14/styles.xml
	modified:   myfirstapp/res/values/attrs.xml
	modified:   myfirstapp/res/values/colors.xml
	modified:   myfirstapp/res/values/strings.xml
	modified:   myfirstapp/src/com/example/myfirstapp/MyGLSurfaceView.java
	modified:   myfirstapp/src/com/example/myfirstapp/MyRenderer.java
	modified:   myfirstapp/src/com/example/myfirstapp/Texture.java
	modified:   myfirstapp/src/com/example/myfirstapp/object/Square.java
	modified:   myfirstapp/src/com/example/myfirstapp/object/Triangle.java
Added cooment to class
Merge branch 'oldchanges'

Conflicts:
	myfirstapp/src/com/example/myfirstapp/MyGLSurfaceView.java
	myfirstapp/src/com/example/myfirstapp/Texture.java
	myfirstapp/src/com/example/myfirstapp/object/Square.java

merged