* Moved brain.h to brain.hpp
* Forgot to rename in main.cpp
Merge branch 'master' of https://github.com/piluke/NeuroSim
* Forgot to rename in main.cpp