First pull since yesterday. New features

Mermaids, divers, food-attraction from the mermaids.