Add two more parallax layers
Trap sprites
Merge branch 'master' of https://github.com/inf-rno/machack2014

Conflicts:
	WebGame/public/main.js