Changed scrollSpeed to 0.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/llc/engine/Camera.java