Local commit for testing
try again
ff
ff
Fixed .gitignore
Merge branch 'david3' into masterb

Conflicts:
	sosgame1/.classpath
	sosgame1/res/layout/view_adjust.xml
	sosgame1/src/com/example/sosgame1/Cube.java
	sosgame1/src/com/example/sosgame1/Line.java
	sosgame1/src/com/example/sosgame1/MainActivity.java
	sosgame1/src/com/example/sosgame1/MyGLRenderer.java
	sosgame1/src/com/example/sosgame1/MyGLSurfaceView.java
trying to fix things
classpath
Fixed bad merges in src files. Don't know why merges were foobared.
Merge branch 'masterb' into Ar

Conflicts:
	sosgame1/bin/classes.dex
	sosgame1/bin/classes/com/example/sosgame1/Line.class
	sosgame1/bin/classes/com/example/sosgame1/MainActivity.class
	sosgame1/bin/classes/com/example/sosgame1/MyGLRenderer.class
	sosgame1/bin/classes/com/example/sosgame1/MyGLSurfaceView.class
	sosgame1/bin/classes/com/example/sosgame1/R$id.class
	sosgame1/bin/classes/com/example/sosgame1/R$layout.class
	sosgame1/bin/dexedLibs/android-support-v4-00a4e1992164261f2067a56ae6916598.jar
	sosgame1/bin/resources.ap_
	sosgame1/bin/sosgame1.apk
	sosgame1/gen/com/example/sosgame1/R.java
Override problem. WTF?