images are now actual size
images are now actual size
adding workspace.xml
Merge branch 'master' into Image_sizing

Conflicts:
	.idea/workspace.xml