2048 update

update to the latest branch