finalized? shields (can hold down, lasts longer)
Revert "fixed broken merge, shields and projectiles work again"

This reverts commit d3b88a5944d205fa320c8a7ada84c1a487237823.
Merge branch 'master' of https://github.com/brdunfield/GGJ2014

Conflicts:
	particles.js