Traps now Killing PuckMan and Ghosts
Merge remote-tracking branch 'origin/master'

Conflicts:
	PuckMan3D.cpp
Merge branch 'master' of https://github.com/bryanpope/PuckMan3D