implemented drawing flippers on canvas
Merge branch 'master' of ssh://athena.dialup.mit.edu/afs/athena.mit.edu/course/6/6.005/git/sp14/projects/gb2/andrew16-changc-mikaelm

Conflicts:
	src/Graphics/Canvas.java