Refactoring website code + fixing cache functionality
Merge pull request #18 from joshualande/devbranch

Refactoring website code + fixing cache functionality