Shane, Safa & Monica's CSS assignment- updated

Pull request to master