�ndrad uppl�sning
Merge branch 'master' into Raful
Merge branch 'master' into Raful
Added grav gun
Grav gun fix
Box collision + player jump bug fix
Box2d
Merge branch 'master' of https://github.com/PutBoy/Floof

Conflicts:
	ExodusFloof/ExodusFloof/Box.cpp
	ExodusFloof/ExodusFloof/ExodusFloof.vcxproj.filters
	ExodusFloof/ExodusFloof/Game.cpp
	ExodusFloof/ExodusFloof/Player.cpp
	ExodusFloof/ExodusFloof/Player.h
	ExodusFloof/ExodusFloof/main.cpp
Merge branch 'Nehro'

Conflicts:
	ExodusFloof/ExodusFloof/Game.cpp
	ExodusFloof/ExodusFloof/Player.cpp
Merge branch 'master' of https://github.com/PutBoy/Floof into Sebastian
merge conflicts
Added grav gun
Merge branch 'master' of https://github.com/PutBoy/Floof

Conflicts:
	ExodusFloof/ExodusFloof/Player.cpp
Updated todo
box2d fix
Merge branch 'master' of https://github.com/PutBoy/Floof

Conflicts:
	ExodusFloof/ExodusFloof/Player.cpp