first commit
Merge branch 'master' of https://github.com/SpikeShape/spike-shape.de