faye setup for instagram photos
Merge pull request #10 from eewang/working_branch

Working branch
change
fixed merge conflicts
Merge pull request #11 from eewang/faye

Faye
fix merge conflicts