Fixed particles
Merge branch 'master' of github.com:dvera2/ggj2014