health bar stuff
Merge branch 'master' of https://github.com/TofuCasserole/ludum-dare-28.git
changed load_png to no longer scale images, and added scale2x to cases
where applicable
Merge branch 'master' of
https://github.com/TofuCasserole/ludum-dare-28.git

Conflicts:
	src/model.py
fixed collision wonkiness with updated scaling