asd
remove temp
mod make
Merge branch 'master' into Capper

Conflicts:
	master.pdf