making the world scroll
Merge branch 'master' of https://github.com/RadioLemon/daniel_loves_brocolli

Conflicts:
	james_loves_brocolli_netbeans/src/bropals/JamesLovesBrocolli.java
	james_loves_brocolli_netbeans/src/bropals/world/World.java