tamaras first commit
Merge branch 'master' of https://github.com/dni/froggystyle

Conflicts:
	game.js