bar life changed
life bar remplaced by kraft's picture
Merge branch 'master' of https://github.com/natoine/Funkiture-2

Conflicts:
	player.lua
	states/game.lua