update notes
Merge branch 'master' of git@github.com:jshearer/ParallelProjects.git

Conflicts:
	doc/Simulator.txt