What is stashing
WHATEVER
Merge branch 'master' of https://github.com/Epiphane/GGJ2014

Conflicts:
	GGJam-html/war/WEB-INF/classes/com/band/ggjam/client/GwtLauncher.class
	GGJam/src/com/band/ggjam/Particle.java