adds Coffee
Merge branch 'master' of https://github.com/SurrenderMonkeys/sm-gamecraft-2013

Conflicts:
	src/game.js
	src/playerComponent.js
Merge branch 'master' of https://github.com/SurrenderMonkeys/sm-gamecraft-2013

Conflicts:
	src/game.js
adds in the lives