bug fixed for FF
bugfix
Merge branch 'master' of https://github.com/firzhugh/frogger
fix
Merge branch 'master' into gh-pages

Conflicts:
	.idea/workspace.xml
	js/app.js