mgfrancis/challenge-2 — pull request #1 by mgfrancis (2014-03-24 17:51:21+00:00)
Title: marilou-francis-layout

modified stylesheet and resolved conflicts within css and html pages.