finished for the most part; just weird debugging left
Merge branch 'master' of https://github.com/stuydw/polygons