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

Conflicts:
	data_extracted_key
	extract_data.c
	insertion.c