changes to AnimatePrep
Merge branch 'master' of https://github.com/rileychapman/project3

Conflicts:
doublePen.m
solving merger issue with derp