more HUD updates
HUD updates
Conflicts:
	states/play.lua
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013
more HUD updates
Merge branch 'temp'