doc ^3
Merge branch 'master' of https://github.com/koschder/ants

Conflicts:
	doc/doc_bachelorthesis/AI-Challenge_Bachelorthesis.pdf