Finished fire effect & started plasma effect
Merge branch 'master' of github.com:Squadella/raspidemo

Conflicts:
	makefile