timer and location changes

added timer, also extra screen for ads at some future point
timer and location changes

added timer, also extra screen for ads at some future point
Game stops after player loses.

This is a temporary fix by setting the timer to 0.  Does the job.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main/code/javascript/logic.js
Merge pull request #17 from JMurf/master

Final updates -