function setTrap added
Merge branch 'master' of https://github.com/Ivan-Dimitrov-bg/TeamHercules

Conflicts:
	scripts/game.js