file read and display working
Merge branch 'master' of https://github.com/nishantpai/ProjectZero

Conflicts:

	build-ProjectZero-Desktop_Qt_5_1_1_MinGW_32bit-Debug/debug/ProjectZero.exe
	build-ProjectZero-Desktop_Qt_5_1_1_MinGW_32bit-Debug/debug/mainwindow.o