Merge branch 'dev' of github.com:ocelotn/spacecrab

Conflicts:
	TestImage.png
	TestImageB.png
	TestImageG.png
	TestImageR.png
	images/TestImage.png
	images/TestImageB.png
	images/TestImageG.png
	images/TestImageR.png
	testdata/images/TestImage.png
	testdata/images/TestImageB.png
	testdata/images/TestImageG.png
	testdata/images/TestImageR.png
Merge branch 'dev' of github.com:ocelotn/spacecrab
minor formatting changes
image parsing and insertion into page generation
fixed issue #39 and cleaned up some of the image parsing code (before closing issue #35)