Fixes bug adding new tile when merging left after nothing merged
Fixes rendering to actually get game over / win when needed
Merge remote-tracking branch 'origin/master' into johnkernke_master

Conflicts:
	lib/game.js