make time limit function
Merge commit 'cd9c2f263fc476a3b0a5bb8d1d834177acd1872c'

Conflicts:
	testexample.html