Fuck yeah hearts with out white pixels
Merge branch 'master' of https://github.com/lcb931023/time_trooper

Conflicts:
	game/js/main.js