Merge pull request #2 from dmdouglas/dmd-tinker

Added iterated prisoner's dilemmas.
Change compete function and strategy colours
Merge remote-tracking branch 'upstream/master' into dmd-tinker

Conflicts:
	assets/browser.js
	browser.coffee.md
	simulation.coffee.md
Agents form a square.

Agents are now static in a square formation.