Shane, Safa & Monica's CSS assignment

Pull request to master