making the timer work
Merge branch 'master' of htttps://github.com/AbhayVarshney/TimeM

Conflicts:
	assignments.html