nothing
Merge branch 'master' of https://github.com/scalableinternetservices/BaconWindshield into expansion
Merge pull request #52 from scalableinternetservices/anders

added sweet carousel
added info in table on favoristes, and working on nearest
fized mergeconf
Merge branch 'master' of https://github.com/scalableinternetservices/BaconWindshield into anders
Merge pull request #53 from scalableinternetservices/expansion

Expansion
Merge branch 'master' of https://github.com/scalableinternetservices/BaconWindshield into anders