testing
adding`
Merge branch 'master' of https://github.com/doggydigit/miniprojet1

Conflicts:
	README
	SConstruct
	src/SConscript
	src/main.hpp
	src/neuron/neuron.cpp
	src/neuron/neuron.hpp
	src/signal/signal.cpp
	src/signal/signal.hpp
	src/types.hpp