Another Description
Merge branch 'david' of https://github.com/JonMasson/Entropy

Conflicts:
	EntropyMain.html