Pulled from devbranch
stuff
Merge branch 'devstage' into devbranch
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into devbranch
added reservations text
paul asked me to push
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into devbranch
changes
fixed merge conflict
Added Flickr images with API
Merge branch 'devbranch' of github.com:ppark482/Restaurant-Group-Project into dev

Merging into my personal dev branch
Merge branch 'thomasdev' into dev

Added the Flickr API ajax calls and images to javascript
menu javascript