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

Conflicts:
	doc/latex/hive_simulation.bcf
	doc/latex/hive_simulation.blg
	doc/latex/hive_simulation.out
	doc/latex/model_description.tex