Merge branch 'master' into weapons
weapons prototype
accomodates slower weapons
Merge pull request #4 from NimbusBP1729/didory_weapons_speed

accomodates slower weapons
asd
Merge branch 'weapons' of https://github.com/didory123/hawkthorne-journey into weapons

Conflicts:
	src/nodes/weapons/battleaxe.lua

Major damage/stats overhaul, change player's base HP to 20
pixel fixes in levels
Merge branch 'master' into weapons
isolate only the weapon stuff
make sure player.lua isn't messed up
isolate weapon stuff
rename lance to glaive
Merge branch 'master' into weapons_stats

Conflicts:
	src/items/recipes.lua
turn glaive into longsword
Merge branch 'master' into weapons_stats

Conflicts:
	src/character_map.lua
blacksmith sells stuff now
fixed the shopping list display error
get rid of 1ups in hud
Merge pull request #5 from NimbusBP1729/shopping_list_fix

fixed the shopping list display error
Merge branch 'master' into weapons_stats

Conflicts:
	src/hud.lua