testing new branch
Some timing changes
Fixed mistake
Merge remote-tracking branch 'origin/pepa'

Conflicts:
	app.js
	index.html