Improved interesections.
Merge branch 'master' of https://github.com/hfuller/Pilgrim

Conflicts:
	js/functions.js