Preliminary
Preliminary
n/a
Merge branch 'supervisor' of github.com:whittenjaw85/pysimiam
Had to remove 'set_zoom' from simulator
Simulator cleanup
Relocated xml-parsers
Fixed collision detection. Uses get_world_envelope() to determine points of an objects's polygon.
Merge branch 'qtsimiam' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py
Merge branch 'physics' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py
Added XML parsing for pid parameters.
Changed the name of one of the tests in test_controller.py
Just a few tweaks for PEP8
Merge branch 'master' of https://github.com/whittenjaw85/pysimiam into test

Conflicts:
	scripts/simulator.py
Merge branch 'test' of github.com:whittenjaw85/pysimiam
Fixed a typo.
Commented Simulator 'raise Exception' - readconfig
Merge branch 'test' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py
Merge branch 'qtsimiam' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py