config hitbox av/på
Merge branch 'master' of https://github.com/tEFFx/piggy

Conflicts:
	Piggy_Game/Kind.cpp
	Piggy_Game/Pickupable.cpp
	Piggy_Game/Player.cpp
	Piggy_Game/Readable.cpp
	Piggy_Game/config.cfg
	Piggy_Game/main.cpp
Merge branch 'master' of https://github.com/tEFFx/piggy
Merge branch 'master' of https://github.com/tEFFx/piggy