metaprogram card
other stuff
in-class review of jquery logic
fix merge conflicts