Refactored the trapmanager
Added playerhealth within the trapmanager and game
Simon says: Clap your hands
Optimized TrapManager Trap Handling and Collisions
Refactored & optimized TrapManager
Removed GodMode
Refactoring TrapManager #3
TrapManager Refactoring #4
Socket.io Update
Refactored Trap.js and options.js for better Trap-Handling
Merge remote-tracking branch 'origin/trapManager' into trapManager
Added requirements for animations to Trap.js
Collisions are working now
GamePlay++
Merge branch 'trapManager'

Conflicts:
	client/obacht/Menu.js
build
Merge branch 'master' of https://github.com/Fannon/IA6.Medienprojekt