umm, did some stuff?
pulled
fixed botched merge
pulled and resolved merge conflict
added in jquery