old modifications - test
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
Fix first merge issues
 Fixed spelling