Basic scaffolding with card html
fixing conflicts