Updated and compared
Merge remote-tracking branch 'origin/master'

Conflicts:
	Learning Node/Part II/scripts/load_albums.js
Updated and compared