Added timer
Removed sync
Merge branch 'timer'

Conflicts:
	app2/index.html
	server2/index.php