First online commit
Merge branch 'master' of https://github.com/sin0emp/SpikeNN