latest update
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality

Conflicts:
	main.lua
Changed name in conf.lua
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality
variables
Fixed a bug that would crash the game if player hit axe with melee
Fixed a bug that crashed the game if the player hit the axe
Increased world.friction and player.acceleration
Implemented Run Speed
Added a reactivity variable to allow for changes to player deceleration w/o affecting acceleration for more reactive controls
Implemented Player Duck/Slide
Updated player and entity bounding/hitboxes

x,y coordinates for player and all entities now correspond to upper left
corner of their bounding box. Adjusted all collision, movement, attack,
and teleport code to reflect these changes.
Created player:setBasicAttack() function

Wrote function to set attack variables to those for the basic melee
attack. Function is called before player:melee() on "v" keypress.
Fixed wall collision glitch
Minor changes.
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality

Conflicts:
	entities/axe.lua
	entities/axethrower.lua
	entities/hellhound.lua
	player.lua
Resolved a few weird inconsistencies that resulted from the branch merge. Everything looks peachy-keen now!
Moving Platforms

Adds basic moving platforms. Platforms don't move the player yet
EdBranch
Moving Platforms again

The player now moves with the platforms
my branch! platformz
Fixing Problems

The player still starts inside the platform. Not sure why, but you can
jump out.
Fixed draw error

Changed graphics.draw back to graphics.drawq