dod
Merge branch 'master' of github.com:mattenrone/Git2PDF

Conflicts:
	main.py