ortho v6
Merge branch 'master' of https://github.com/DA2I/Barcraft

Conflicts:
	premices.tex