Added user-story-4 simplified
Added local storage extra bonus
Merge code from previous user story