Prelim. simulation code.
Merge branch 'master' of https://github.com/pedromarinyo/steven-tibbs

Conflicts:
	scripts/globals.js