timing
Merge branch 'master' of https://github.com/silvermss/firstproject

Conflicts:
	notify.js