f
Merge branch 'master' of https://github.com/rut-cambium/LetsAskUS

Conflicts:
	js/videoAndTimerManager.js