Merge git and svn histories

git-svn-id: svn://svn.macaulay2.com/Macaulay2/workshops/IMA-2011@16086 a8012f80-5f13-0410-8dc0-eb77bd940c0d