Start on front-end
Merge branch 'master' into front-end
MOAR FRONT END
Merge branch 'master' into front-end
Implemented local storage