Update Screen.hpp
Update Screen.cpp
Update Viewer.cpp
Update Viewer.hpp
Update Viewer.cpp
Merge branch 'master' of https://github.com/critor/nPDF into critor-master

Conflicts:
	Viewer.cpp
Merge branch 'critor-master'