needles
now with borders
fixed merge conflict
removed extra images
Merge pull request #596 from scopatz/wab

needles!