Added timer
Added credit to Aaron.
Merge branch 'errorscenarios'

Conflicts:
	presentation/HTML5 applications that run (almost) forever.html