init
nothing
building for deploy
depl
added on heroku
Building for deployment
added timers on selection
Merge commit '27b7fc4fbc72f7956c2b0056f7a92949a2ed91b0'

Conflicts:
	LICENCE.html
	public/application.js