Added menuitemsjs file to hold js related to menu items call
Added dist folder to gitignore for all branches except Master
Added templates for menu items
Removed console.log
Resolved Merge conflict between staging and menu-items
Modified bower.json to include Bourbon and Neat
modify style
remove a tons of white spaces in scss
Added Flickr API call
Modified API call for menu items
Modified index to include menu items and flick data
formating changes
formating changes
Modified to match thachbranch to avoid merge conflict
Resolved merge conflict in index and main.scss
Merge pull request #11 from powellmichael/staging

Merge Staging into Master