I came here to fix shit and kick ass, and all the shit is fixed
Merge branch 'simulator' of github.com:szymoniks/COMP3001 into simulator

Conflicts:
	simulator/simulator.py
	simulator/test_alg.py