added categories
merging in master
Merge branch 'master' into changing-images

* master:
  lol wat a joke
  skelly the skeleton
  joke-telling skeleton
added vegetable 2
added images and switching
images are insync
Merge branch 'master' into changing-images
pulling in charlase changes
* master:
  fix numbers
  jk lol
  LAME PUNS COMPLETE" "
  text
  no highlighting
Merge pull request #5 from varunrau/changing-images

Changing images