Merge pull request #1 from alllenwang/master

change photostream.html
World cup
Merge pull request #4 from pysherlock/master

World Cup