modified:   populations.txt
	modified:   runTemp.txt
nothing
Merge branch 'master' of https://github.com/abernatskiy/pdmmod
nothing
Merge branch 'master' of https://github.com/abernatskiy/pdmmod
nothing
Merge branch 'master' of https://github.com/abernatskiy/pdmmod

Conflicts:
	runTemp.txt
Merge branch 'master' of https://github.com/abernatskiy/pdmmod
Merge branch 'master' of https://github.com/abernatskiy/pdmmod
weird simulation bug. gonna check later

	new file:   collSperes-stats.png
	new file:   collSperes-stats2.png
	new file:   collSperes-stats3.png
	new file:   collSperes13-sq.png
	new file:   copy0-hidr-stats.png
	new file:   copy0-hidr-stats2.png
	new file:   copy0-stats.png
	new file:   hydrolysis-Stats.png
	new file:   hydrolysis-Stats02.png
	new file:   hydrolysis-time.png
	new file:   hydrolysis-time02.png
	modified:   main.cpp
	modified:   model.cpp
	modified:   model.h
	modified:   model005.h
	modified:   plotData.py
	modified:   populations.txt
	modified:   runTemp.txt
	modified:   runtimes.py
	modified:   specie.h
	modified:   stats.pdf
	modified:   totalPopulation.cpp
	new file:   weird.png
	new file:   weird2.png
	new file:   weird3.png
Merge branch 'master' of https://github.com/abernatskiy/pdmmod

Conflicts:
	runTemp.txt
	runtimes.py