starting rectangular neighbors
merge
start fixing neighbors
Merge branch 'master' of https://github.com/zackm/CS184_Final_Project
merge
misc changes
merge