yet another jump
Merge remote branch 'upstream/master'
fake score
stash
score
reborn
fix bug
Merge remote branch 'upstream/master'

Conflicts:
	app.js
Merge pull request #3 from PopPopRet/master

merge