fix sass fields
Merge pull request #4 from scubbasteve302/steven

Clean
Added FAKE vendor services but still using zappos API
removing caching of resources
Merge branch 'steven' of github.com:scubbasteve302/QRiosity
new font and banner image
conflict resolution
Merge branch 'master' of github.com:scubbasteve302/QRiosity
sass directory ignored
Grid layout
Merge branch 'master' of https://github.com/scubbasteve302/QRiosity into steven

Merge master
Update framework