adds /react bustrocks
adds /react shakeyatailfeather
fixes merge conflicts
fixes whitespace issues
Merge pull request #15 from niederer/master

LOOKS GR8