start implementing local and session storage functionality
Merge remote-tracking branch 'origin/master'