Merge branch 'master' of https://github.com/samuelo91/Social-System-Modelling-Project

Conflicts:
	code/simulate.m
	code/test.mat
merge