added css to prevent logos from overflowing box
fixed conflicts and another bug
Merge pull request #311 from CalvinFernandez/well-behaved-logos

added css to prevent logos from overflowing box