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.