A few bugfixes (?) check them.
Merge branch 'master' of https://github.com/niranjanravi/Assignment-4
Merge and tweak World.java
Merge something i forgot to merge
Merge pull request #12 from jcao219/master

changes