my makefile
Merge branch 'master' of github.com:Macaulay2/M2
update NormalToricVarieties.m2

new file provided by Greg Smith
Merge branch 'master' of github.com:Macaulay2/M2
Added Divisor.m2 for consideration in Macaulay2
Merge remote-tracking branch 'upstream/pull/159'

Conflicts:
	M2/Macaulay2/packages/=distributed-packages
add new package Divisor to the list of changes
Merge branch 'master' of github.com:Macaulay2/M2