small changes
Merge branch 'master' of https://github.com/naibaf7/Hive-Simulation

Conflicts:
	doc/latex/results_and_discussion.tex