Edited syntax
Merge branch 'master' of https://github.com/mananshah99/timer

Conflicts:
	.DS_Store