added comments to notes.py
fixed conflict in readme
Merge branch 'master' of https://github.com/sahadzahir/Spoken-Document-Retrieval

Conflicts:
	README.txt