v8
jiji
Merge branch 'master' of https://github.com/abobrins/pdffiles

Conflicts:
	wifi.txt