test 3
petit essai
Merge branch 'master' of https://github.com/jeesay/vertigo.git

Conflicts:
	scenegraph/Camera.java