Added isFinished() function that returns true if maxTime has been reached and returns false otherwise in timer.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	Git/timer.js