Second simulate iteration

Worked on the second iteration of the simulate function so it is more in
line with the solution goal.
Merge remote-tracking branch 'origin/master'

Conflicts:
	project1.py