Basic JPG output (with random images)
Merge branch 'master' into image-output

Conflicts:
	Makefile
	src/main.cpp
Merge pull request #1 from merlinND/image-output

Basic JPG output (with random images)