Feature: can change timer alert text. Fix: timer issue.
Merge branch 'master' of https://github.com/KernelCorp/vote

Conflicts:
	db/schema.rb