初始化
Merge branch 'master' of https://github.com/skyhacker2/PDFReader

Conflicts:
	.gitignore