added possibility to generate a 4 on a cell
Merge branch 'master' of https://github.com/poupou9779/z2048

Conflicts:
	src/functions.c