initial work on the flickr photo stream
running gulp before merge
Merge branch 'staging' of github.com:locomotes/restaurant into layout
flickr photo feed is live
fixed merge conflicts
style edits for flickr stream
commit before merge
fixed merged conflicts
merge conflicts
testing
gulped
commit to checkout
deleted unnecessary files
fixing merge conflicts
gulp
gulped
fixed merge conflicts
got the allergies,spicy,etc data working