made changes to application controller
got the timer to work
Merge branch 'minh' into ryan

Conflicts:
	app/views/welcome/index.html.erb