#98 additional fix
Merge branch 'master' of github.com:2014-Android-ITX4/RollingBALL

Conflicts:
	app/src/main/java/com/example/rollingball/app/World02Scene.java