Animated diver
Merge origin/master

Conflicts:
	tube.cpp