Merge branch 'develop'
Added a configuration file for the simulations
Merge branch 'master'

Conflicts:
	code_C_seq/src/main.c