Merge branch 'nicole'
Fixed package json
Merge branch 'master' of https://github.com/ctrovato/grubQuest
Merge branch 'master' into nicole
changed padding on result items
Merge branch 'master' into nicole
fixed padding on filters and pagination