master merge
added margin to bottom of div