Adds Notes dictionary. Refactoring code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py
Adds Notes dictionary. Refactoring code.