* commit before conflict
Merge branch 'master' of https://github.com/lePurificateur/2048

Conflicts:
	2048/src/frame/JFrame2048.java