proper blocks
Merge branch 'master' of https://github.com/sylvainblot/koin

Conflicts:
	src/checkpoints.cpp
changing background