configurable maxTile
Merge branch 'master' of https://github.com/fogelek/2048

Conflicts:
	js/game_manager.js