correct neighbor setting
Merge branch 'master' of github.com:brookman/Ludum-Dare-26
changed TileShifting
resolved conflicts