updated stuff
Merge branch 'master' of https://github.com/donachys/simpy

Conflicts:
	document/Combined_Doc_1204.docx
added Combined_Doc_1204_b_COMBINED.docx