final pdf

final
Merge branch 'master' of https://github.com/frankgu/King-new

Conflicts:
	mainwindow.cpp