tnt explodes by collision
Merge branch 'master' of https://github.com/crisHH/Angry-Birds

Conflicts:
	src/ab/physics/simulation/AngryBirdsTestbedTest.java