implementing alternate collapsed margin algo
implementing alt collapsing margin algo
bug fixes for new margin collapsing
fixing margin collapsing bugs
various fixes
added doc for margin collapsing