Merge pull request #24 from iph/merge-zach-to-master

Merge zach to master
Added all the intersection points for each tile.
Added zach's changes