Implementing caching functionality into website
load fewer thumbnails for faster loading
resolving conflicts
Merge pull request #7 from joshualande/devbranch

Devbranch