simple animation
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/whale/1.gif