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

Conflicts:
	.gitignore
	jpeg_cpy