mokvdoma, sicocxleebi
very basic collision detection
add heart image
Merge branch 'master' of https://github.com/sandro93/iceblocks

Conflicts:
	ball.py
	iceblocks.py

	modified:   ball.py
	modified:   consts.py
	modified:   iceblocks.conf
	modified:   iceblocks.py
	modified:   message.py
	modified:   peddle.py
Merge branch 'master' of https://github.com/sandro93/iceblocks

conflics resolved