Reduced world size
Re-implemented diagonal movement
Merge branch 'master'