Flickr branch merge

for week 9 turn in