added 1up token
bats always drop 1ups now
increased punching bounding box
lightning and oval
lightning works
oval back
Merge branch 'master' into player_attack_box

Conflicts:
	src/player.lua
done
Merge pull request #967 from CalebJohn/oval-cutscene

Welcome to Hawkthorne
Merge pull request #961 from NimbusBP1729/player_attack_box

increased punching bounding box
Merge pull request #946 from NimbusBP1729/life_token

added 1up token
Simplify the i18n code