comments and misc..
rebase conflict..
first commit, cp-d Bastiens omp code in model.cpp..
Merge branch 'omp' of https://github.com/ssolo/ALE into omp

Conflicts:
	Makefile