Test de synchro 2
Merge branch 'master' of github.com:ioa42/ld30

Conflicts:
	program.cpp