working score display
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013
HUD improvements
HUD impovements

Conflicts:
	main.lua
score refinement/hud improvement
Merge branch 'master' of https://github.com/cedophile/global-game-jam-2013

Conflicts:
	main.lua