haaaaaaands
Merge branch 'master' of https://github.com/Zilby/Per10-Zilbersher-Reschke-Lasercore

Conflicts:
	README.md~
	Sketchbook/libraries/gifAnimation/docs/readme.md
	Sketchbook/libraries/gifAnimation/examples/gifDisplay/data/lavalamp.gif
	Sketchbook/libraries/gifAnimation/examples/gifDisplay/gifDisplay.pde

Sketchbook/libraries/gifAnimation/examples/gifExport/data/processing.png
	Sketchbook/libraries/gifAnimation/examples/gifExport/gifExport.pde
	Sketchbook/libraries/gifAnimation/library.properties
	Sketchbook/libraries/gifAnimation/library/gifAnimation.jar
	Sketchbook/libraries/gifAnimation/src/Gif.java
	Sketchbook/libraries/gifAnimation/src/GifDecoder.java
	Sketchbook/libraries/gifAnimation/src/GifEncoder.java
	Sketchbook/libraries/gifAnimation/src/GifMaker.java