v1
Merge branch 'master' of https://github.com/z3d1k/Stegano_Koch

Conflicts:
	bitmessage.cpp
	bitmessage.h
	bmp.cpp
	bmp.h
	main.cpp
	mainwidget.cpp
	mainwidget.h
	stegano_project.pro
	stegokoch.cpp
	stegokoch.h