agd
Merge branch 'master' of https://github.com/PutBoy/Floof into Sebastian
merge conflicts
box2d fix
Merge branch 'master' of https://github.com/PutBoy/Floof

Conflicts:
	ExodusFloof/ExodusFloof/Player.cpp