#20 define number of lives in game as "constant"
#21 manage lives in player
Merge remote-tracking branch 'origin/master'

Conflicts:
	class/player.js