Ortho v3
Merge branch 'master' of https://github.com/DA2I/Barcraft

Conflicts:
	organisation.tex