nothing much
Merge branch 'master' of https://github.com/Macaulay2/Workshop-2014-Berkeley

Conflicts:
	F-sing/PosChar.m2
Merge branch 'master' of https://github.com/Macaulay2/Workshop-2014-Berkeley