setLookAtM 3 -> 4
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/example/TheSeedAdventure/MyGLRenderer.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/example/TheSeedAdventure/MyGLRenderer.java