More trap automation.
Merge branch 'master' of https://github.com/Ardnived/ApeMaze

Conflicts:
	client.html
	client/client.js
	resources/style.css
	server/socket.js