Changes in dependencies
Merge branch 'master' of https://github.com/Juan23/Notes

Conflicts:
	scripts/views/notesView.js