* origin/master: Computer history and quotes fixed # Conflicts: # package-lock.json # package.json # todayV2.js