Merge pull request #1 from glenegbert/ian_branch

change waffle badge
Merge pull request #13 from glenegbert/ian_branch

Ian branch
solved migration issue
adjusting navbar
Merge pull request #19 from glenegbert/ian_branch

Ian branch
added carousel
fixed merge conflict in layouts
pulled master and added store model
added items to home page
Merge pull request #21 from glenegbert/rolando_homepage_layout

Rolando homepage layout
add image to store
temporary styling for store/store items