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

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

Conflicts:
	play.bat
fixed a bug, minor changes
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality

Conflicts:
	player.lua
Changes to camera zoom for universal fullscreen size
Scaled fullscreen to 18 tiles
Calibrated Movement Variables
Removed Run Speed
Calibrated Basic Melee and Charged Melee Variables
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality

Conflicts:
	player.lua
added markers to side of map
Merge branch 'evansDesignmods2'

Conflicts:
	player.lua
Fixed a bunch of merge issues