Merge branch 'master', remote-tracking branch 'upstream/master'
merged with upstream/master
animated particle behaviors
Merge branch 'master' of git://github.com/rfboyce/cntdwn into rfboyce-master

Conflicts:
	clck/clck.pde
	clck/particle.pde