first commit
Merge branch 'master' of github.com:iamjiex/Hello_libjpeg

Conflicts:
	.gitignore