timer is done
Merge branch 'master' of https://github.com/una/blackout-bunny

Conflicts:
	index.html
	src/minigames/puzzleGame.js