added timer

Signed-off-by: Pritika Nilaratna <pritika.16@gmail.com>
deleted!

Signed-off-by: Pritika Nilaratna <pritika.16@gmail.com>
Merge branch 'master' of https://github.com/nilaratna/tater

Signed-off-by: Pritika Nilaratna <pritika.16@gmail.com>

Conflicts:
	js/app.js
	storage/play.dat
	storage/status.dat
	storage/users.dat