updated duration intervals
updates
Merge branch 'step3'

Conflicts:
	js/main.js