added html and js files
flickr api starter
flickr api starter
Merging flickr api progress
trying to fix js error
got the template working for the menu/appetizers section
added the entree list as well!
ran gulp just to make sure I didnt miss anything before merging with stage
Merge branch 'restaurant-api' into stage
integrated api menu progress
changed the name of js file to avoid conflict
deleted other main.js file
finished template for restaurant api, including menu appetizers & entrees, specials, and newsfeed
finished template for restaurant api, including menu appetizers & entrees, specials, and newsfeed
got rid of main.js to avoid confusion
fixing merge conflicts