fixing merge bugs
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality

Conflicts:
	main.lua
asdsad
Added updated plaguewalker
Re-Added Camera Lock
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality

Conflicts:
	player.lua
poop
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality

Conflicts:
	player.lua
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality
particles
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality
particle changes
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality
Adjusting ability hitboxes and collision detection
Fixed collision detection
Adjusted Basic and Charged Melee Hitbox Width (1 tile + .5 player width, translated to center of player)
Changed basic attack variables