fixes
Image update
Merge branch 'master' of https://github.com/kennahasson/COGS120

Conflicts:
	routes/timer.js
	views/home.handlebars
	views/timer.handlebars
fixes