faye setup for instagram photos
change
fixed merge conflicts
Merge pull request #11 from eewang/faye

Faye