The contact angle and two-phase flow