conflict merge
Merge branch 'Slave' of https://github.com/tvishnu/TimeSaver.git into
Slave

Conflicts:
	src/main/java/Vishnu/TimeSaver/PdfReader.java