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

Conflicts:
	main.lua
double jump (Nathan)
working on wall jump (Nathan)
got wall jump working mostly right and wall sliding working. Bugs: If you don't jump away from the wall(if you walk away) then you still fall slowly
Merge branch 'master' of https://github.com/thebassinator143/projectbrutality into NathanWallJump

Conflicts:
	player.lua
Fixed walljump and slide stuff