Merged liz and mines code I think...
Merged now?
Merge branch 'animateMovementDev' of
https://github.com/beloitcollegecomputerscience/foldr.git into
animateMovementDev

Conflicts:
	src/foldr/shape/Shape.java