Test
Merge branch 'master' of https://github.com/einsiedler0408/2048

Conflicts:
	README.md