maj
Merge branch 'master' of github.com:Daisuki91/stegaTux

Conflicts:
	extract_data
	insertion.c
	jpeg_stegano.c