created cards.haml skeleton
fixed merge conflict in style.css