merge conflicts blah
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
add favicon
blah
Merge branch 'master' of https://github.com/kemccabe/betsy_rails
Merge branch 'products'
products index page + home page are now in a GRID
a lil padding didn't hurt anyone